Thanks to visit codestin.com
Credit goes to github.com

Skip to content

ci: switch macOS Intel builds to Rosetta 2 #133

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ci: switch macOS Intel builds to Rosetta 2 #133

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 11 additions & 5 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
[
"Lnx x64/ubuntu-latest",
"Lnx A64/ubuntu-24.04-arm",
"Mac x64/macos-13",
"Mac x64/macos-latest+rosetta2",
"Mac A64/macos-latest",
empty] as $runners |

Expand Down Expand Up @@ -76,6 +76,8 @@ jobs:
(if $qemuSystem then {
"aarch64-linux": "arm64",
}[$qemuSystem] else null end) as $qemuSystemForAction |
($runner | split("+rosetta2")) as [$runner, $rosetta2] |
($rosetta2 != null) as $rosetta2 |
# (if $qemuSystem then $subsets[] else "all" end) as $subset |
$subsets[] as $subset |
select(($runner | startswith("macos")) or ($subset != "mame")) |
Expand All @@ -89,7 +91,7 @@ jobs:
.) as $displayNixpkgs |
("\($displayRunner)-\($displayNixpkgs)-\($subset)" | gsub(" "; "-")) as $cacheName |
(if $qemuSystem then "TODO make qemu builds work again" | error else . end) |
{$displayRunner, $runner, $qemuSystem, $qemuSystemForAction, $displayNixpkgs, $nixpkgs, $nixpkgsPath, $subset, $nurRepo, $cachixName, $cacheName}
{$displayRunner, $runner, $qemuSystem, $qemuSystemForAction, $rosetta2, $displayNixpkgs, $nixpkgs, $nixpkgsPath, $subset, $nurRepo, $cachixName, $cacheName}
]}

EOF
Expand Down Expand Up @@ -177,6 +179,10 @@ jobs:
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
with:
platforms: ${{ matrix.qemuSystemForAction }}
- name: Install Rosetta 2
if: ${{ matrix.rosetta2 }}
run: |
softwareupdate --install-rosetta --agree-to-license
- name: Install nix
uses: nixbuild/nix-quick-install-action@63ca48f939ee3b8d835f4126562537df0fee5b91 # v32
with:
Expand Down Expand Up @@ -249,7 +255,7 @@ jobs:
outputs = {self, Rhys-T, nixpkgs}: let inherit (nixpkgs) lib; in {
cacheOutputs = lib.pipe Rhys-T.legacyPackages [
(builtins.mapAttrs (system: ps: ps.ci.cacheOutputsAsAttrs or null))
(lib.filterAttrs (system: co: system == $(nix-instantiate --eval '<nixpkgs>' -A system) && co != null))
(lib.filterAttrs (system: co: system == ${{ matrix.rosetta2 && '"x86_64-darwin"' || '$(nix-instantiate --eval ''<nixpkgs>'' -A system)' }} && co != null))
];
};
}
Expand All @@ -258,14 +264,14 @@ jobs:
nix flake lock "$tempFlake"
nix shell github:Mic92/nix-fast-build 'nixpkgs#ansifilter' -c bash -c '
set -o pipefail
nix-fast-build -f "$tempFlake#cacheOutputs" --skip-cached --no-nom 2>&1 | \
nix-fast-build -f "$tempFlake#cacheOutputs" --skip-cached --no-nom ${{ matrix.rosetta2 && '--systems x86_64-darwin' || '' }} 2>&1 | \
tee >(ansifilter > /tmp/build-uncached.log)
'
- name: Upload build logs
if: '!cancelled()'
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with:
name: Rhys-T-nur-packages-build-logs-${{ matrix.runner }}${{ matrix.qemuSystem && format('+qemu-{0}', matrix.qemuSystem) || '' }}-${{ matrix.nixpkgs }}-${{ matrix.subset }}
name: Rhys-T-nur-packages-build-logs-${{ matrix.runner }}${{ matrix.qemuSystem && format('+qemu-{0}', matrix.qemuSystem) || '' }}${{ matrix.rosetta2 && '+rosetta2' || '' }}-${{ matrix.nixpkgs }}-${{ matrix.subset }}
path: |
/tmp/tempFlake
/tmp/build-uncached.log
Expand Down
Loading