reenable mac ci

symphorien · Oct 22, 2023 · 697a353 · 697a353
1 parent 437e952
commit 697a353
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,16 +7,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2.5.0
-    - uses: cachix/install-nix-action@v18
+    - uses: cachix/install-nix-action@v23
+      with:
+        nix_path: nixpkgs=channel:nixos-unstable
+    - run: nix-build test.nix
+  mac:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2.5.0
+    - uses: cachix/install-nix-action@v23
       with:
         nix_path: nixpkgs=channel:nixos-unstable
     - run: nix-build test.nix
-  # spurious failures due to https://github.com/kolloch/crate2nix/issues/263
-  # mac:
-  #   runs-on: macos-latest
-  #   steps:
-  #   - uses: actions/checkout@v2.5.0
-  #   - uses: cachix/install-nix-action@v18
-  #     with:
-  #       nix_path: nixpkgs=channel:nixos-unstable
-  #   - run: nix-build test.nix
diff --git a/test.nix b/test.nix
@@ -2,6 +2,11 @@ let
   isDerivation = x: (x.type or null) == "derivation";
   tryEvalOpt = x: let res = builtins.tryEval x; in if res.success then res.value else null;
   allNixVersions = pkgs: [ pkgs.nixStable pkgs.nixUnstable ] ++ (builtins.filter isDerivation (map tryEvalOpt (builtins.attrValues (pkgs.nixVersions or { }))));
+  isDarwin = (builtins.match ".*darwin.*" builtins.currentSystem) != null;
+  channelsToTest = if isDarwin then
+    [ "channel:nixos-unstable" ] # buildRustCrate is broken on 23.05 due to stripping rlibs
+  else
+    [ "channel:nixos-23.05" "channel:nixos-unstable" ];
 in
 map
   (url:
@@ -10,4 +15,4 @@ map
       channel_name = builtins.replaceStrings [ "channel:" ] [ "" ] (builtins.toString url);
     in
     map (x: (pkgs.callPackage ./nix-du.nix { nix = x; }).tested.overrideAttrs (old: { name = old.name + "-${channel_name}-nix-(${x.version}"; })) (allNixVersions pkgs)
-  ) [ "channel:nixos-23.05" "channel:nixos-unstable" ]
+  ) channelsToTest