ci: enable macos-13 build

holochain · May 31, 2024 · 1e78278 · 1e78278
1 parent b45957f
commit 1e78278
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 49 deletions.
diff --git a/.github/workflows/build-and-cache.yaml b/.github/workflows/build-and-cache.yaml
@@ -10,8 +10,7 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
-        # os: [ubuntu-latest, macos-latest, macos-13]
+        os: [ubuntu-latest, macos-latest, macos-13]
         package: [launcher]
         # package: [holochain, lair-keystore, launcher]
       fail-fast: false

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -131,21 +131,22 @@
               nonCargoBuildFiles = path: _type: builtins.match ".*(js|json|png)$" path != null;
               includeFilesFilter = path: type:
                 (craneLib.filterCargoSources path type) || (nonCargoBuildFiles path type);
+              craneLib = (inputs.crane.mkLib pkgs).overrideToolchain rust;
+              # For x86_64-darwin Apple SDK 10_12 needs to be referenced throughout
               apple_sdk =
                 if system == "x86_64-darwin"
                 then pkgs.darwin.apple_sdk_10_12
                 else pkgs.darwin.apple_sdk_11_0;
-              craneLib = (inputs.crane.mkLib pkgs).overrideToolchain rust;
             in
             craneLib.buildPackage {
               pname = "hc-launch";
               version = "workspace";
+              # This is confusing, but it does not work otherwise
               stdenv =
                 if pkgs.stdenv.isDarwin then
                   pkgs.overrideSDK pkgs.stdenv "11.0"
                 else
                   pkgs.stdenv;
-
               # only build hc-launch binary
               cargoExtraArgs = "--bin hc-launch";
               # Use Launcher sources as defined in input dependencies and include only those files defined in the