Skip to content
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

Jump to bottom

[ADP-3173] Enable aarch64-darwin #4259

Merged
merged 3 commits into from
Jan 31, 2024
Merged

[ADP-3173] Enable aarch64-darwin #4259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85b1326
ci: Drop seemingly superfluous `nix build` flags
HeinrichApfelmus Jan 30, 2024
766ccf1
ci: Run unit tests on `aarch64-darwin`
HeinrichApfelmus Nov 22, 2023
d9a8286
ci: Add `macos-silicon` package
HeinrichApfelmus Jan 30, 2024
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
19 changes: 17 additions & 2 deletions .buildkite/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,18 +186,33 @@ steps:
- label: 'Run unit tests (macOS, x86_64)'
key: macos-tests-unit
depends_on: macos-nix
command: 'GC_DONT_GC=1 nix build --max-silent-time 0 --max-jobs 1 -L .#ci.x86_64-darwin.tests.run.unit'
command: 'nix build -L .#ci.x86_64-darwin.tests.run.unit'
agents:
system: ${macos}

- label: 'Run unit tests (macOS, arm64)'
depends_on: macos-nix
key: macos-build-tests-arm64
command: 'nix build -L .#ci.aarch64-darwin.tests.run.unit'
agents:
system: ${macos}

- label: 'Build package (macOS, x86_64)'
key: macos-package
depends_on: macos-nix
command: nix build --max-silent-time 0 --max-jobs 1 -o result/macos-intel .#packages.x86_64-darwin.ci.artifacts.macos-intel.release
command: 'nix build -o result/macos-intel .#packages.x86_64-darwin.ci.artifacts.macos-intel.release'
artifact_paths: [ "./result/macos-intel/**" ]
agents:
system: ${macos}

- label: 'Build package (macOS, arm64)'
key: macos-package-arm64
depends_on: macos-nix
command: 'nix build -o result/macos-silicon .#packages.aarch64-darwin.ci.artifacts.macos-silicon.release'
artifact_paths: [ "./result/macos-silicon/**" ]
agents:
system: ${macos}

- block: "Build package (linux)"
if: |
build.branch !~ /^gh-readonly-queue\/master/
Expand Down
5 changes: 3 additions & 2 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@
check;

nodePkgs = cardano-node-runtime.legacyPackages.${system};
nodePackages = cardano-node-runtime.packages.${system};
nodeProject = cardano-node-runtime.project.${system};

walletProject = (import ./nix/haskell.nix
Expand Down Expand Up @@ -378,8 +379,8 @@
macOsPkgs.cardano-wallet
macOsPkgs.bech32
macOsPkgs.cardano-address
nodePkgs.hydraJobs.native.cardano-cli
nodePkgs.hydraJobs.native.cardano-node
nodePackages.cardano-cli
nodePackages.cardano-node
];
platform = "macos-silicon";
format = "tar.gz";
Expand Down
2 changes: 1 addition & 1 deletion nix/supported-systems.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"x86_64-linux"
"x86_64-darwin"
# TODO: Enable aarch64-darwin when there are Hydra builders for it
# "aarch64-darwin"
"aarch64-darwin"
]
Loading