Skip to content

Commit

Permalink
Attempt macos-13 CI
Browse files Browse the repository at this point in the history
  • Loading branch information
guillemcordoba committed Sep 11, 2024
1 parent 014ab17 commit 1038fb1
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test-nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
build-and-cache:
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
os: [ubuntu-latest, macos-latest, macos-13]

runs-on: ${{ matrix.os }}
steps:
Expand Down
12 changes: 1 addition & 11 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ rec {
flake = {
lib = rec {
holochainDeps = { pkgs, lib }:
(with pkgs; [ perl openssl ])
(with pkgs; [ perl openssl go ])
++ (lib.optionals pkgs.stdenv.isLinux [ pkgs.pkg-config pkgs.go ])
++ (let
apple_sdk = if pkgs.system == "x86_64-darwin" then
Expand All @@ -31,16 +31,6 @@ rec {

apple_sdk.frameworks.AppKit
apple_sdk.frameworks.WebKit

(apple_sdk.stdenv.mkDerivation {
name = "go";
nativeBuildInputs = with pkgs; [ makeBinaryWrapper go ];
dontBuild = true;
dontUnpack = true;
installPhase = ''
makeWrapper ${pkgs.go}/bin/go $out/bin/go
'';
})
]));

filterByHolochainPackageType = holochainPackageType: packages:
Expand Down
9 changes: 3 additions & 6 deletions nix/fixtures/module-repo/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions nix/fixtures/module-repo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,9 @@ holochain = "0.3.2"

[profile.release]
opt-level = "z"


[patch.crates-io]
# Revert to crates.io once https://github.com/holochain/lair/issues/133 is fixed
lair_keystore = { git = "https://github.com/guillemcordoba/lair", branch = "fix-sqlformat" }
lair_keystore_api = { git = "https://github.com/guillemcordoba/lair", branch = "fix-sqlformat" }
2 changes: 1 addition & 1 deletion nix/fixtures/module-repo/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 1038fb1

Please sign in to comment.