Merge #3831

3831: Change `Check nix (macOS)` to post-merge r=HeinrichApfelmus a=HeinrichApfelmus

### Overview

This pull request moves all `macOS` tests to the "post-merge" granularity.

### Comment

* This restores the state introduced by #3688
* The decision in Continuous Integration :: AP has been amended to reflect the state above.

### Issue number

Continuous Integration :: AP

Co-authored-by: Heinrich Apfelmus <heinrich.apfelmus@iohk.io>

.buildkite/pipeline.yml

@@ -145,33 +145,28 @@ steps:
     env:
       TMPDIR: "/cache"
 
+  - block: "macOS steps"
+    depends_on: linux-nix
+    key: trigger-macos
+    if: 'build.branch != "master"'
+
   - label: 'Check nix (macOS)'
+    depends_on: trigger-macos
     key: macos-nix
-    depends_on: linux-nix
     commands:
       - './nix/regenerate.sh'
     agents:
       system: ${macos}
 
-  - block: "macOS test"
-    depends_on: macos-nix
-    if: 'build.branch != "master"'
-    key: trigger-macos-test
-
   - label: 'Run unit tests (macOS)'
-    depends_on: trigger-macos-test
+    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}
 
-  - block: "macOS package"
-    depends_on: macos-nix
-    if: '(build.branch != "staging") && (build.branch != "trying") && (build.branch != "master")'
-    key: trigger-macos-package
-
   - label: 'Build package (macOS)'
-    depends_on: trigger-macos-package
+    depends_on: macos-nix
     key: build-macos
     command: nix build --max-silent-time 0 --max-jobs 1 -o result/macos-intel .#ci.artifacts.macos-intel.release
     artifact_paths: [ "./result/macos-intel/**" ]