diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml index cd993d4e7..bde059b91 100644 --- a/.github/workflows/windows-release-build.yml +++ b/.github/workflows/windows-release-build.yml @@ -154,7 +154,7 @@ jobs: zlib1g-dev \ aria2 echo Setup wine - aria2c "https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/dQz_aHy8Rl-Lt0xf2WlrMw/artifacts/public/build/wine.tar.zst" -o wine.tar.zst + aria2c "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.cache.level-3.toolchains.v3.linux64-wine.latest/artifacts/public/build/wine.tar.zst" -o wine.tar.zst tar --zstd -xf wine.tar.zst -C ~/win-cross rm wine.tar.zst echo Setup Visual Studio diff --git a/build/windows/sign.ps1 b/build/windows/sign.ps1 index 83f2ff040..aa1226840 100644 --- a/build/windows/sign.ps1 +++ b/build/windows/sign.ps1 @@ -215,20 +215,12 @@ SignAndPackage x86_64 $files = Get-ChildItem .\windsign-temp\windows-x64-signed-x86_64, .\windsign-temp\windows-x64-signed-arm64 -Recurse -Include *.exe signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha256 /v $files -# Compress each signed bundle into a single gzip tarball (`-C .` so it has -# no top-level directory) and upload it as a release asset on the windows-binaries -# repo, keyed to this build's run id. Release assets keep the bundles out of git -# (they were too large to commit) while still living in the windows-binaries repo. -# The gated release job downloads and expands these from that repo's releases. $binariesRepo = "zen-browser/windows-binaries" $stagingTag = "windows-signed-$GithubRunId" echo "Ensuring staging release $stagingTag exists on $binariesRepo" -gh release view $stagingTag --repo $binariesRepo *> $null +gh release create $stagingTag --repo $binariesRepo --prerelease --title "Windows signed bundles ($GithubRunId)" --notes "Signed Windows bundles for run $GithubRunId, consumed by the release workflow. Safe to delete." if ($LASTEXITCODE -ne 0) { - gh release create $stagingTag --repo $binariesRepo --prerelease --title "Windows signed bundles ($GithubRunId)" --notes "Signed Windows bundles for run $GithubRunId, consumed by the release workflow. Safe to delete." - if ($LASTEXITCODE -ne 0) { - throw "Failed to create staging release $stagingTag on $binariesRepo" - } + throw "Failed to create staging release $stagingTag on $binariesRepo" } foreach ($name in @("x86_64", "arm64")) {