aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Engelbrecht <[email protected]>2025-06-18 15:48:54 +0200
committerGitHub Enterprise <[email protected]>2025-06-18 15:48:54 +0200
commitc7517e13b0516dd684da2547964d4c5e2f3decb5 (patch)
treef9a6a5fc471fefb8c225736b2008f1911f76391d
parentsymbol gen hack-fix for linux (diff)
downloadzen-c7517e13b0516dd684da2547964d4c5e2f3decb5.tar.xz
zen-c7517e13b0516dd684da2547964d4c5e2f3decb5.zip
symbol gen hack-fix for linux (#442)v5.6.13-pre2
-rw-r--r--.github/workflows/create_release.yml7
-rw-r--r--xmake.lua5
2 files changed, 7 insertions, 5 deletions
diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml
index 7f934a71d..d8acf7adc 100644
--- a/.github/workflows/create_release.yml
+++ b/.github/workflows/create_release.yml
@@ -109,10 +109,13 @@ jobs:
env:
INSTALL_DIR: ./scripts
+# Temporary workaround for linux since we had to disable symbols in separate file...
- name: Upload To Sentry
run: |
- scripts/sentry-cli debug-files bundle-sources build/linux/x86_64/release/zenserver.sym build/linux/x86_64/release/zen.sym
- scripts/sentry-cli --auth-token ${{ secrets.SENTRY_API_KEY }} debug-files upload --org to --project zen-server build/linux/x86_64/release/zenserver build/linux/x86_64/release/zen build/linux/x86_64/release/zenserver.sym build/linux/x86_64/release/zen.sym build/linux/x86_64/release/zenserver.src.zip build/linux/x86_64/release/zen.src.zip
+ scripts/sentry-cli debug-files bundle-sources build/linux/x86_64/release/zenserver build/linux/x86_64/release/zen
+ scripts/sentry-cli --auth-token ${{ secrets.SENTRY_API_KEY }} debug-files upload --org to --project zen-server build/linux/x86_64/release/zenserver build/linux/x86_64/release/zen build/linux/x86_64/release/zenserver.src.zip build/linux/x86_64/release/zen.src.zip
+# scripts/sentry-cli debug-files bundle-sources build/linux/x86_64/release/zenserver.sym build/linux/x86_64/release/zen.sym
+# scripts/sentry-cli --auth-token ${{ secrets.SENTRY_API_KEY }} debug-files upload --org to --project zen-server build/linux/x86_64/release/zenserver build/linux/x86_64/release/zen build/linux/x86_64/release/zenserver.sym build/linux/x86_64/release/zen.sym build/linux/x86_64/release/zenserver.src.zip build/linux/x86_64/release/zen.src.zip
- name: Upload zenserver-linux
uses: actions/upload-artifact@v3
diff --git a/xmake.lua b/xmake.lua
index ce1831e89..fa8fecf5a 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -48,7 +48,6 @@ if is_plat("linux") and "$(env UE_TOOLCHAIN_DIR)" ~= "" then
add_ldflags("$(projectdir)/thirdparty/ue-libcxx/lib64/libc++.a")
add_ldflags("$(projectdir)/thirdparty/ue-libcxx/lib64/libc++abi.a")
set_toolset("objcopy", "$(env UE_TOOLCHAIN_DIR)/bin/llvm-objcopy")
-
end
add_requires("vcpkg::mimalloc")
@@ -193,9 +192,9 @@ set_languages("cxx20")
-- always generate debug information
set_symbols("debug")
--- temporary workaround linux build fails with "section [index 46] has invalid sh_entsize: expected 16, but got 0" if we don't strip all symbols
+-- temporary workaround for linux build fails with "section [index 46] has invalid sh_entsize: expected 16, but got 0" if we don't strip all symbols
if is_plat("linux") and "$(env UE_TOOLCHAIN_DIR)" ~= "" then
- set_strip("all")
+ set_strip("none")
end
includes("src/transports")