Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build sentry from source #706

Open
wants to merge 24 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 19 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive

- name: Download CLI
shell: pwsh
Expand Down Expand Up @@ -214,7 +216,7 @@ jobs:
run: docker exec --user root unreal bash -c '
apt-get update ;
add-apt-repository ppa:ubuntu-toolchain-r/test ;
apt-get install -y libstdc++6'
apt-get install -y libstdc++6 cmake'

- name: Download package
uses: actions/download-artifact@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sdk-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
if [[ "${{ inputs.target }}" == "Android" ]]; then
submodule="modules/sentry-java"
else
submodule="modules/sentry-native"
submodule="plugin-dev/sentry-native"
fi
echo "submodule=$submodule" >> $GITHUB_OUTPUT
echo "path=plugin-dev/Source/ThirdParty/${{ inputs.target }}" >> $GITHUB_OUTPUT
Expand All @@ -67,7 +67,7 @@ jobs:
chmod +x llvm.sh
sudo ./llvm.sh 13
sudo ./llvm.sh 16
sudo apt-get -y install libc++-16-dev libc++abi-16-dev libstdc++-11-dev zlib1g-dev libcurl4-openssl-dev
sudo apt-get -y install libc++-16-dev libc++abi-16-dev libstdc++-11-dev zlib1g-dev libcurl4-openssl-dev cmake

- uses: actions/setup-java@v4
if: ${{ inputs.target == 'Android' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
native:
uses: getsentry/github-workflows/.github/workflows/updater.yml@v2
with:
path: modules/sentry-native
path: plugin-dev/sentry-native
name: Native SDK
secrets:
api-token: ${{ secrets.CI_DEPLOY_KEY }}
Expand Down
7 changes: 4 additions & 3 deletions .gitmodules
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did it need to move to plugin-dev? It was located on modules before and it's unclear why it had to change.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The SDK plugin now needs to know the path to native in order to build. I did originally try do this via symlink but with the SDK itself being used as a symlink it caused errors and pointed to the wrong direction. The safest and least error prone option for users was to simple move native into the SDK folder so that wherever you build SDK it can easily locate native without manual user steps

Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[submodule "modules/sentry-java"]
path = modules/sentry-java
url = https://github.com/getsentry/sentry-java.git
[submodule "modules/sentry-native"]
path = modules/sentry-native
url = https://github.com/getsentry/sentry-native.git

[submodule "plugin-dev/sentry-native"]
path = plugin-dev/sentry-native
url = https://github.com/getsentry/sentry-native.git
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

### Features

- Build sentry from source ([#706](https://github.com/getsentry/sentry-unreal/pull/706))
PlasmaDev5 marked this conversation as resolved.
Show resolved Hide resolved

### Dependencies

- Bump Native SDK from v0.7.16 to v0.7.17 ([#717](https://github.com/getsentry/sentry-unreal/pull/717))
Expand Down
1 change: 0 additions & 1 deletion modules/sentry-native
Submodule sentry-native deleted from 407253
Loading
Loading