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

Add x86_64-apple cross #2

Merged
merged 10 commits into from
Jun 24, 2024
Merged

Add x86_64-apple cross #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5d817a0
Add x86_64-apple cross
ThetaSinner Jun 24, 2024
199a3a3
Fix platform name
ThetaSinner Jun 24, 2024
06d59fd
Fix platform name
ThetaSinner Jun 24, 2024
4658768
Build intel apple on own platform
ThetaSinner Jun 24, 2024
a6bde54
Fix target availability logic
ThetaSinner Jun 24, 2024
24b6ed2
Bad platform name
ThetaSinner Jun 24, 2024
fc7d7cd
Bad platform name
ThetaSinner Jun 24, 2024
16f6a6d
Build all
ThetaSinner Jun 24, 2024
a5b8fb2
Fix runs on
ThetaSinner Jun 24, 2024
c91001c
Fix target
ThetaSinner Jun 24, 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
30 changes: 28 additions & 2 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,22 @@ jobs:
with:
install_url: https://releases.nixos.org/nix/nix-2.20.4/install

- name: Build for x86_64-apple-darwin
- name: Build for aarch64-apple-darwin
run: nix build .#holochain_aarch64-apple

build-holochain-legacy-apple:
runs-on: macos-13
steps:
- uses: actions/checkout@v4

- name: Install nix
uses: cachix/install-nix-action@v26
with:
install_url: https://releases.nixos.org/nix/nix-2.20.4/install

- name: Build for x86_64-apple-darwin
run: nix build .#holochain_x86_64-apple

build-lair-keystore:
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -88,9 +101,22 @@ jobs:
with:
install_url: https://releases.nixos.org/nix/nix-2.20.4/install

- name: Build for x86_64-apple-darwin
- name: Build for aarch64-apple-darwin
run: nix build .#lair_keystore_aarch64-apple

build-lair-keystore-legacy-apple:
runs-on: macos-13
steps:
- uses: actions/checkout@v4

- name: Install nix
uses: cachix/install-nix-action@v26
with:
install_url: https://releases.nixos.org/nix/nix-2.20.4/install

- name: Build for x86_64-apple-darwin
run: nix build .#lair_keystore_x86_64-apple

bundle-x86-64-linux:
runs-on: ubuntu-latest
steps:
Expand Down
13 changes: 13 additions & 0 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@
crossSystem = "aarch64-darwin";
rustTargetTriple = "aarch64-apple-darwin";
};
} else if localSystem == "x86_64-darwin" then {
"${package}_x86_64-apple" = import ./modules/holochain-cross.nix {
inherit localSystem inputs crate package;
crossSystem = "x86_64-darwin";
rustTargetTriple = "x86_64-apple-darwin";
};
} else { });

defineLairKeystorePackages = {}: {
Expand All @@ -97,6 +103,13 @@
crossSystem = "aarch64-darwin";
rustTargetTriple = "aarch64-apple-darwin";
};

} else if localSystem == "x86_64-darwin" then {
lair_keystore_x86_64-apple = import ./modules/lair-keystore-cross.nix {
inherit localSystem inputs;
crossSystem = "x86_64-darwin";
rustTargetTriple = "x86_64-apple-darwin";
};
} else { });

extractHolochainBin = bin: pkgs.stdenv.mkDerivation {
Expand Down