aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/create_release.yml10
-rw-r--r--CHANGELOG.md1
-rw-r--r--VERSION.txt2
-rw-r--r--repo/packages/o/oidctoken/xmake.lua23
-rw-r--r--scripts/bundle.lua11
-rw-r--r--src/zenserver/xmake.lua11
-rw-r--r--thirdparty/oidctoken/bin/linux-x64/OidcTokenbin0 -> 18835419 bytes
-rw-r--r--thirdparty/oidctoken/bin/osx-x64/OidcTokenbin0 -> 18908752 bytes
-rw-r--r--thirdparty/oidctoken/bin/win-x64/OidcToken.exebin0 -> 36700552 bytes
-rw-r--r--toolchains/ue_clang.lua2
-rw-r--r--xmake.lua1
11 files changed, 50 insertions, 11 deletions
diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml
index 2eeedc0c2..3345573c0 100644
--- a/.github/workflows/create_release.yml
+++ b/.github/workflows/create_release.yml
@@ -26,7 +26,7 @@ jobs:
run: |
xmake config -v -y -m release --zensentry=yes
- - name: Bundle
+ - name: Build and Bundle
run: |
xmake bundle -v -y --codesignidentity="Epic Games"
@@ -62,13 +62,13 @@ jobs:
run: |
xmake config -v -y -m release --zensentry=yes --toolchain=ue-clang --sdk=${{ github.workspace }}/.tmp-ue-toolchain
- - name: Bundle
+ - name: Build and Bundle
run: |
xmake bundle -v -y
- name: Get Sentry CLI
run: |
- curl -sL https://sentry.io/get-cli/ | bash
+ curl -sL https://sentry.io/get-cli/ | SENTRY_CLI_VERSION="3.2.0" bash
ls -la ./scripts
env:
INSTALL_DIR: ./scripts
@@ -100,13 +100,13 @@ jobs:
run: |
xmake config -v -y -m release --zensentry=yes
- - name: Bundle
+ - name: Build and Bundle
run: |
xmake bundle -v -y --codesignidentity="Developer ID Application"
- name: Get Sentry CLI
run: |
- curl -sL https://sentry.io/get-cli/ | bash
+ curl -sL https://sentry.io/get-cli/ | SENTRY_CLI_VERSION="3.2.0" bash
ls -la ./scripts
env:
INSTALL_DIR: ./scripts
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72cfe3102..39fa3747e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
- Feature: Added 404 page to dashboard, to make it easier to find your way back to a valid URL
- Feature: HttpClient now properly handles multi-part request/response
- Feature: Added `POST` variant to `/builds/{namespace}/{bucket}/{buildid}/blobs/{hash}` endpoint that accepts a CbObject payload with 1 or more ranges
+- Feature: OidcToken helper executable is now bundled with the zen/zenserver binaries
- Improvement: `zen builds download` now uses multi-range requests for blocks to reduce download size
- Improvement: `zen oplog-import` now uses partial block with multi-range requests for blocks to reduce download size
- Improvement: Improved feedback in log/console during `zen oplog-import`
diff --git a/VERSION.txt b/VERSION.txt
index 9dae045da..78852c09f 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.7.22-pre0 \ No newline at end of file
+5.7.22-pre4 \ No newline at end of file
diff --git a/repo/packages/o/oidctoken/xmake.lua b/repo/packages/o/oidctoken/xmake.lua
new file mode 100644
index 000000000..76360e7bf
--- /dev/null
+++ b/repo/packages/o/oidctoken/xmake.lua
@@ -0,0 +1,23 @@
+package("oidctoken")
+ set_description("OidcToken - OIDC token helper binary")
+ set_sourcedir(path.join(os.scriptdir(), "../../../../thirdparty/oidctoken"))
+
+ on_install(function (package)
+ if is_plat("windows") then
+ os.cp("bin/win-x64/OidcToken.exe", package:installdir("bin"))
+ elseif is_plat("linux") then
+ os.cp("bin/linux-x64/OidcToken", package:installdir("bin"))
+ os.exec("chmod 755 %s", package:installdir("bin", "OidcToken"))
+ elseif is_plat("macosx") then
+ os.cp("bin/osx-x64/OidcToken", package:installdir("bin"))
+ os.exec("chmod 755 %s", package:installdir("bin", "OidcToken"))
+ end
+ end)
+
+ on_test(function (package)
+ if is_plat("windows") then
+ os.run("%s --help", package:installdir("bin", "OidcToken.exe"))
+ else
+ os.run("%s --help", package:installdir("bin", "OidcToken"))
+ end
+ end)
diff --git a/scripts/bundle.lua b/scripts/bundle.lua
index b2a5e1e08..6f540c5b8 100644
--- a/scripts/bundle.lua
+++ b/scripts/bundle.lua
@@ -199,8 +199,9 @@ local function main_windows(signidentity)
"build/windows/x64/release/zenserver.pdb",
"build/windows/x64/release/zen.exe",
"build/windows/x64/release/zen.pdb",
- "build/windows/x64/release/crashpad_handler.exe")
-end
+ "build/windows/x64/release/crashpad_handler.exe",
+ "build/windows/x64/release/oidctoken.exe")
+ end
--------------------------------------------------------------------------------
local function main_mac(signidentity)
@@ -277,7 +278,8 @@ local function main_mac(signidentity)
"build/zenserver-macos.zip",
"build/macosx/universal/release/zenserver",
"build/macosx/universal/release/zen",
- "build/macosx/universal/release/crashpad_handler")
+ "build/macosx/universal/release/crashpad_handler",
+ "build/macosx/x86_64/release/Oidctoken")
end
--------------------------------------------------------------------------------
@@ -288,7 +290,8 @@ local function main_linux()
"build/zenserver-linux.zip",
"build/linux/x86_64/release/zenserver",
"build/linux/x86_64/release/zen",
- "build/linux/x86_64/release/crashpad_handler")
+ "build/linux/x86_64/release/crashpad_handler",
+ "build/linux/x86_64/release/Oidctoken")
end
--------------------------------------------------------------------------------
diff --git a/src/zenserver/xmake.lua b/src/zenserver/xmake.lua
index 7a9031782..f2ed17f05 100644
--- a/src/zenserver/xmake.lua
+++ b/src/zenserver/xmake.lua
@@ -33,6 +33,7 @@ target("zenserver")
add_packages("json11")
add_packages("lua")
add_packages("consul")
+ add_packages("oidctoken")
add_packages("nomad")
if has_config("zenmimalloc") then
@@ -161,6 +162,16 @@ target("zenserver")
copy_if_newer(path.join(installdir, "bin", consul_bin), path.join(target:targetdir(), consul_bin), consul_bin)
end
+ local oidctoken_pkg = target:pkg("oidctoken")
+ if oidctoken_pkg then
+ local installdir = oidctoken_pkg:installdir()
+ local oidctoken_bin = "OidcToken"
+ if is_plat("windows") then
+ oidctoken_bin = "OidcToken.exe"
+ end
+ copy_if_newer(path.join(installdir, "bin", oidctoken_bin), path.join(target:targetdir(), oidctoken_bin), oidctoken_bin)
+ end
+
local nomad_pkg = target:pkg("nomad")
if nomad_pkg then
local installdir = nomad_pkg:installdir()
diff --git a/thirdparty/oidctoken/bin/linux-x64/OidcToken b/thirdparty/oidctoken/bin/linux-x64/OidcToken
new file mode 100644
index 000000000..eb623bbab
--- /dev/null
+++ b/thirdparty/oidctoken/bin/linux-x64/OidcToken
Binary files differ
diff --git a/thirdparty/oidctoken/bin/osx-x64/OidcToken b/thirdparty/oidctoken/bin/osx-x64/OidcToken
new file mode 100644
index 000000000..2c0ed61b5
--- /dev/null
+++ b/thirdparty/oidctoken/bin/osx-x64/OidcToken
Binary files differ
diff --git a/thirdparty/oidctoken/bin/win-x64/OidcToken.exe b/thirdparty/oidctoken/bin/win-x64/OidcToken.exe
new file mode 100644
index 000000000..48eed387b
--- /dev/null
+++ b/thirdparty/oidctoken/bin/win-x64/OidcToken.exe
Binary files differ
diff --git a/toolchains/ue_clang.lua b/toolchains/ue_clang.lua
index 8a1efcc04..1fdb05ff9 100644
--- a/toolchains/ue_clang.lua
+++ b/toolchains/ue_clang.lua
@@ -38,7 +38,7 @@ toolchain("ue-clang")
toolchain:set("toolset", "ld", path.join(bindir, "clang++"))
toolchain:set("toolset", "sh", path.join(bindir, "clang++"))
toolchain:set("toolset", "ar", path.join(bindir, "llvm-ar"))
- toolchain:set("toolset", "strip", path.join(bindir, "llvm-strip"))
+ toolchain:set("toolset", "strip", path.join(bindir, "x86_64-unknown-linux-gnu-strip"))
toolchain:set("toolset", "objcopy", path.join(bindir, "llvm-objcopy"))
toolchain:set("toolset", "as", path.join(bindir, "clang"))
toolchain:set("toolset", "ranlib", path.join(bindir, "llvm-ranlib"))
diff --git a/xmake.lua b/xmake.lua
index 3454b264a..dfe383c1a 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -75,6 +75,7 @@ add_requires("eastl", {system = false})
add_requires("consul", {system = false}) -- for hub tests
add_requires("nomad", {system = false}) -- for nomad provisioner tests
+add_requires("oidctoken", {system = false})
if has_config("zenmimalloc") and not use_asan then
add_requires("mimalloc", {system = false})
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-26 00:28:13 +0000