wip ci: Temporarily reenable macOS tests

cardano-foundation · Nov 20, 2023 · dacea72 · dacea72
1 parent 7237635
commit dacea72
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 33 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -20,8 +20,12 @@ steps:
   - wait: ~
     if: 'build.branch == "staging"'
 
+  - block: "Build package and docker image (linux)"
+    key: trigger-linux
+
   - label: 'Check nix (linux)'
     # Check whether regenerate.sh was applied when it had to be applied.
+    depends_on: trigger-linux
     key: linux-nix
     commands:
       - './nix/regenerate.sh'
@@ -133,7 +137,7 @@ steps:
   - block: "macOS steps"
     depends_on: linux-nix
     key: trigger-macos
-    if: 'build.branch != "master"'
+    if: 0 == 1 #'build.branch != "master"'
 
   - label: 'Check nix (macOS)'
     depends_on: trigger-macos
@@ -142,15 +146,15 @@ steps:
       - './nix/regenerate.sh'
     agents:
       system: ${macos}
-    if: 0 == 1 # Disabled for now until a macos mini is available
+    # if: 0 == 1 # Disabled for now until a macos mini is available
 
   - label: 'Run unit tests (macOS)'
     depends_on: macos-nix
     key: macos-build-tests
     command: 'GC_DONT_GC=1 nix build --max-silent-time 0 --max-jobs 1 -L .#ci.${macos}.tests.run.unit'
     agents:
       system: ${macos}
-    if: 0 == 1 # Disabled for now until a macos mini is available
+    # if: 0 == 1 # Disabled for now until a macos mini is available
 
   - label: 'Build package (macOS)'
     depends_on: macos-nix
@@ -159,7 +163,7 @@ steps:
     artifact_paths: [ "./result/macos-intel/**" ]
     agents:
       system: ${macos}
-    if: 0 == 1 # Disabled for now until a macos mini is available
+    # if: 0 == 1 # Disabled for now until a macos mini is available
 
   - block: "Build package and docker image (linux)"
     depends_on: linux-nix

diff --git a/flake.nix b/flake.nix
@@ -384,36 +384,46 @@
                 };
             }
             # macos is never cross-compiled
-            // lib.optionalAttrs buildPlatform.isMacOS {
-              macos-intel = lib.optionalAttrs buildPlatform.isx86_64 {
-                release = import ./nix/release-package.nix {
-                  inherit pkgs;
-                  exes = let macOsPkgs = mkPackages project; in [
-                    macOsPkgs.cardano-wallet
-                    macOsPkgs.bech32
-                    macOsPkgs.cardano-address
-                    nodePkgs.hydraJobs.native.cardano-cli
-                    nodePkgs.hydraJobs.native.cardano-node
-                  ];
-                  platform = "macos-intel";
-                  format = "tar.gz";
+            // lib.optionalAttrs buildPlatform.isMacOS (
+              let 
+                macOSPkgsIntel = 
+                  if buildPlatform.isAarch64
+                    then mkPackages project.projectCross.x86_64-darwin
+                    else mkPackages project;
+                macOSPkgsSilicon =
+                  if buildPlatform.isAarch64
+                    then mkPackages project
+                    else mkPackages project.projectCross.aarch64-darwin;
+              in {
+                macos-intel = {
+                  release = import ./nix/release-package.nix {
+                    inherit pkgs;
+                    exes = [
+                      macOSPkgsIntel.cardano-wallet
+                      macOSPkgsIntel.bech32
+                      macOSPkgsIntel.cardano-address
+#                      nodePkgs.hydraJobs.native.cardano-cli
+#                      nodePkgs.hydraJobs.native.cardano-node
+                    ];
+                    platform = "macos-intel";
+                    format = "tar.gz";
+                  };
                 };
-              };
-              macos-silicon = lib.optionalAttrs buildPlatform.isAarch64 {
-                release = import ./nix/release-package.nix {
-                  inherit pkgs;
-                  exes = let macOsPkgs = mkPackages project; in [
-                    macOsPkgs.cardano-wallet
-                    macOsPkgs.bech32
-                    macOsPkgs.cardano-address
-                    nodePkgs.hydraJobs.native.cardano-cli
-                    nodePkgs.hydraJobs.native.cardano-node
-                  ];
-                  platform = "macos-silicon";
-                  format = "tar.gz";
+                macos-silicon = {
+                  release = import ./nix/release-package.nix {
+                    inherit pkgs;
+                    exes = [
+                      macOSPkgsSilicon.cardano-wallet
+                      macOSPkgsSilicon.bech32
+                      macOSPkgsSilicon.cardano-address
+#                      nodePkgs.hydraJobs.native.cardano-cli
+#                      nodePkgs.hydraJobs.native.cardano-node
+                    ];
+                    platform = "macos-silicon";
+                    format = "tar.gz";
+                  };
                 };
-              };
-            };
+              });
         in
         rec {
 

diff --git a/nix/supported-systems.nix b/nix/supported-systems.nix
@@ -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"
 ]