Skip to content

ci: use larger runner for signed Windows Desktop releases #221

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.

Sign up for GitHub

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

Merged
killswitch-GUI merged 2 commits into from
Sep 28, 2026
Merged

ci: use larger runner for signed Windows Desktop releases #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
630f923
ci: speed Windows Desktop releases and publish v0.11.0 package metadata
killswitch-GUI Sep 28, 2026
282c7a2
test: assert signed Windows release runner
killswitch-GUI Sep 28, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -941,7 +941,7 @@ jobs:
name: Sign, package, and smoke Windows Desktop
if: needs.validate.outputs.publish_draft == 'true'
needs: validate
runs-on: windows-2025
runs-on: windows-latest-l
Comment thread
killswitch-GUI marked this conversation as resolved.
environment: release-signing
timeout-minutes: 100
permissions:
Expand Down
10 changes: 5 additions & 5 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@
"x86_64-linux"
];
forAllSystems = nixpkgs.lib.genAttrs systems;
version = "0.10.9";
version = "0.11.0";
releases = {
aarch64-darwin = {
target = "aarch64-apple-darwin";
sha256 = "9eb7f10e7cd345c20b3c63b51484d3749bd76ae2bd470fa6756781783f6742d9";
sha256 = "c5140fa28173641838069e4ec331ef3848c8f3a4f3149b174e09380719e75b9a";
};
x86_64-darwin = {
target = "x86_64-apple-darwin";
sha256 = "5b9a57ccd2fdc5efe8c41b5e24594daacf9dfafa38bce3a3f240f7a07dd272fa";
sha256 = "c274017f83a11b47123e80471417548029123b245ae04b0ae4386b78c2b07478";
};
aarch64-linux = {
target = "aarch64-unknown-linux-musl";
sha256 = "a1b7d0c3501615b016d27a24d069a17b383dbb923654f65c0c83b3cbd5fd7fe9";
sha256 = "efad03b81b04b66900acd4c835031aca4c2be4294a409d0c23df643e0f277407";
};
x86_64-linux = {
target = "x86_64-unknown-linux-musl";
sha256 = "19d7e1e19f2bbfecfef486294f89f9802aec9a0447857119ffa855513e93250d";
sha256 = "f520245f4c02e5c3fe7b3e926bb2663d39b97566f0eefa34ef860a09d515f9c5";
};
};
in {
Expand Down
12 changes: 7 additions & 5 deletions packaging/homebrew/Formula/colossus.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ class Colossus < Formula

on_macos do
if Hardware::CPU.arm?
url "https://github.com/obscuritylabs/Colossus/releases/download/v0.10.9/colossus-0.10.9-aarch64-apple-darwin.tar.gz"
sha256 "9eb7f10e7cd345c20b3c63b51484d3749bd76ae2bd470fa6756781783f6742d9"
url "https://github.com/obscuritylabs/Colossus/releases/download/v0.11.0/colossus-0.11.0-aarch64-apple-darwin.tar.gz"
sha256 "c5140fa28173641838069e4ec331ef3848c8f3a4f3149b174e09380719e75b9a"
else
url "https://github.com/obscuritylabs/Colossus/releases/download/v0.10.9/colossus-0.10.9-x86_64-apple-darwin.tar.gz"
sha256 "5b9a57ccd2fdc5efe8c41b5e24594daacf9dfafa38bce3a3f240f7a07dd272fa"
url "https://github.com/obscuritylabs/Colossus/releases/download/v0.11.0/colossus-0.11.0-x86_64-apple-darwin.tar.gz"
sha256 "c274017f83a11b47123e80471417548029123b245ae04b0ae4386b78c2b07478"
end
end

Expand All @@ -19,7 +19,9 @@ def install
libexec.install "tools/rg" => "rg"
(share/"licenses/colossus/ripgrep").install "tools/COPYING", "tools/LICENSE-MIT", "tools/UNLICENSE"
end
(bin/"colossus").write_env_script libexec/"colossus", COLOSSUS_INSTALLER_KIND: "homebrew", COLOSSUS_BUNDLED_RIPGREP: ((libexec/"rg").exist? ? "1" : "0")
bundled_rg = (libexec/"rg").exist? ? "1" : "0"
env = { COLOSSUS_INSTALLER_KIND: "homebrew", COLOSSUS_BUNDLED_RIPGREP: bundled_rg }
(bin/"colossus").write_env_script libexec/"colossus", env
end

test do
Expand Down
1 change: 1 addition & 0 deletions scripts/ci/desktop-contract.test.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1205,6 +1205,7 @@ test("Developer Preview compilation and ad-hoc signing use separate runners", ()
assert.match(windowsJob, /Start-Process -FilePath \$uninstallers/u);
assert.match(windowsJob, /Colossus processes remained after uninstall/u);

assert.match(signedWindowsJob, /runs-on: windows-latest-l/u);
assert.match(signedWindowsJob, /environment: release-signing/u);
assert.match(signedWindowsJob, /id-token: write/u);
assert.match(signedWindowsJob, /COLOSSUS_DESKTOP_TEAM_ID: OBSCURITY_LABS_LLC/u);
Expand Down
3 changes: 2 additions & 1 deletion scripts/ci/homebrew-formula.test.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@ test("renders a fixed-origin two-architecture prebuilt formula", () => {
assert.match(formula, /b{64}/u);
assert.match(
formula,
/\(bin\/"colossus"\)\.write_env_script libexec\/"colossus", COLOSSUS_INSTALLER_KIND: "homebrew"/u,
/\(bin\/"colossus"\)\.write_env_script libexec\/"colossus", env/u,
);
assert.match(formula, /COLOSSUS_INSTALLER_KIND: "homebrew"/u);
assert.match(formula, /COLOSSUS_BUNDLED_RIPGREP: bundled_rg/u);
assert.match(formula, /colossus --version/u);
assert.doesNotMatch(formula, /^\s*version\s+"/mu);
assert.doesNotMatch(formula, /\n\s*bin\.write_env_script/u);
Expand Down
4 changes: 3 additions & 1 deletion scripts/ci/render-homebrew-formula.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ function render(version, armSha, intelSha) {
libexec.install "tools/rg" => "rg"
(share/"licenses/colossus/ripgrep").install "tools/COPYING", "tools/LICENSE-MIT", "tools/UNLICENSE"
end
(bin/"colossus").write_env_script libexec/"colossus", COLOSSUS_INSTALLER_KIND: "homebrew", COLOSSUS_BUNDLED_RIPGREP: ((libexec/"rg").exist? ? "1" : "0")
bundled_rg = (libexec/"rg").exist? ? "1" : "0"
env = { COLOSSUS_INSTALLER_KIND: "homebrew", COLOSSUS_BUNDLED_RIPGREP: bundled_rg }
(bin/"colossus").write_env_script libexec/"colossus", env
end

test do
Expand Down
Loading