-
Notifications
You must be signed in to change notification settings - Fork 185
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix the release workflow and enable GCS in the Windows binaries. (#4439)
This PR fixes the release workflow for macOS by updating the OS image (it used macOS 11 while regular CI uses 12), enables GCS in the released Windows binaries, and does two other changes that should speed-up the release workflow on Windows. --- TYPE: NO_HISTORY
- Loading branch information
1 parent
2e95dcc
commit ab87e06
Showing
7 changed files
with
35 additions
and
71 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -87,7 +87,7 @@ jobs: | |
echo "${{ toJSON(steps.runvcpkg.outputs) }}" | ||
- name: Prevent vpckg from building debug variants | ||
run: ./scripts/ci/posix/patch_vcpkg_triplets.sh | ||
run: python ./scripts/ci/patch_vcpkg_triplets.py | ||
|
||
- name: Setup sccache | ||
uses: mozilla-actions/[email protected] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
import os | ||
|
||
workspace = os.curdir | ||
triplet_paths = [os.path.join(workspace, "external", "vcpkg", "triplets"), | ||
os.path.join(workspace, "ports", "triplets")] | ||
|
||
for triplet_path in triplet_paths: | ||
for path, dnames, fnames in os.walk(triplet_path): | ||
for fname in fnames: | ||
fname = os.path.join(path, fname) | ||
print(fname) | ||
with open(fname, "rb") as handle: | ||
contents = handle.read() | ||
# If a file is already patched we skip patching it again because | ||
# this affects the hashes calculated by vcpkg for caching | ||
if b"VCPKG_BUILD_TYPE release" in contents: | ||
continue | ||
contents += b"\nset(VCPKG_BUILD_TYPE release)\n" | ||
with open(fname, "wb") as handle: | ||
handle.write(contents) |
This file was deleted.
Oops, something went wrong.