From 702a15cbaa032899f2321fda892faf723d32efca Mon Sep 17 00:00:00 2001
From: Maksym H <1177472+mordamax@users.noreply.github.com>
Date: Thu, 5 Sep 2024 17:02:24 +0100
Subject: [PATCH] minor fixes pipeline (#5607)

- [return macos jobs to
gitlab](https://github.com/paritytech/polkadot-sdk/commit/dcd44b1d8bb681b66cbc0a063a6a999bd8253cdc)
- [add benches to merge
queue](https://github.com/paritytech/polkadot-sdk/commit/494eb21bb9ac4633f3217e6b58ba7256aea6e38a)
- [require test-deterministic-wasm and run it
earlier](https://github.com/paritytech/polkadot-sdk/commit/ab9ae5ca6c5128e002cc745d608e542138633250)
---
 .github/workflows/tests-misc.yml | 69 +++++++++++++-------------------
 .gitlab-ci.yml                   |  5 +++
 .gitlab/pipeline/test.yml        | 22 ++++++++++
 3 files changed, 54 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/tests-misc.yml b/.github/workflows/tests-misc.yml
index 824e8c11c2a4..2e78f4a34ede 100644
--- a/.github/workflows/tests-misc.yml
+++ b/.github/workflows/tests-misc.yml
@@ -121,7 +121,7 @@ jobs:
 
   test-deterministic-wasm:
     timeout-minutes: 20
-    needs: [ set-image, test-frame-ui ]
+    needs: [ set-image ]
     runs-on: ${{ needs.set-image.outputs.RUNNER }}
     container:
       image: ${{ needs.set-image.outputs.IMAGE }}
@@ -144,7 +144,7 @@ jobs:
 
   cargo-check-benches-branches:
     needs: [ set-image ]
-    if: ${{ github.event_name == 'pull_request' }}
+    if: ${{ github.event_name == 'pull_request' || github.event_name == 'merge_group' }}
     timeout-minutes: 60
     outputs:
       branch: ${{ steps.branch.outputs.branch }}
@@ -354,46 +354,30 @@ jobs:
           cp .forklift/config.toml /github/home/.forklift/config.toml
           PYTHONUNBUFFERED=x .github/scripts/check-each-crate.py ${{ matrix.index }} ${{ strategy.job-total }}
 
-  # TODO: enable when we have a macos Self-Hosted runners
-  #  cargo-check-each-crate-macos:
-  #    timeout-minutes: 120
-  #    needs: [ set-image ]
-  #    runs-on: macos-latest
-  #    env:
-  #      RUSTFLAGS: "-D warnings"
-  #      CI_JOB_NAME: cargo-check-each-crate
-  #      IMAGE: ${{ needs.set-image.outputs.IMAGE }}
-  #    strategy:
-  #      fail-fast: false
-  #      matrix:
-  #        index: [ 1,2,3,4,5,6,7,8,9,10 ] # 10 parallel jobs
-  #    steps:
-  #      - name: Checkout
-  #        uses: actions/checkout@v4.1.7
-  #
-  #      - run: |
-  #          VERSION=$(echo $IMAGE | sed -E 's/.*:bullseye-([^-]+)-.*/\1/')
-  #          echo $VERSION
-  #          echo "VERSION=$VERSION" >> $GITHUB_ENV
-  #
-  #      - run: |
-  #          rustup install $VERSION
-  #          rustup default $VERSION
-  #
-  #      - name: Check Rust
-  #        run: |
-  #          rustup show
-  #          rustup +nightly show
-  #
-  #      - name: MacOS Deps
-  #        run: |
-  #          brew install protobuf openssl pkg-config zlib xz zstd llvm jq curl gcc make cmake
-  #          rustup target add wasm32-unknown-unknown --toolchain $VERSION
-  #          rustup component add rust-src rustfmt clippy --toolchain $VERSION
-  #
-  #      - name: script
-  #        run: |
-  #          PYTHONUNBUFFERED=x .github/scripts/check-each-crate.py ${{ matrix.index }} ${{ strategy.job-total }} True
+  # cargo-check-each-crate-macos:
+  #   timeout-minutes: 120
+  #   needs: [ set-image ]
+  #   runs-on: macOS
+  #   env:
+  #     RUSTFLAGS: "-D warnings"
+  #     CI_JOB_NAME: cargo-check-each-crate
+  #     IMAGE: ${{ needs.set-image.outputs.IMAGE }}
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       index: [ 1,2,3,4,5,6,7,8,9,10 ] # 10 parallel jobs
+  #   steps:
+  #     - name: Checkout
+  #       uses: actions/checkout@v4.1.7
+
+  #     - name: Install dependencies
+  #       uses: ./.github/actions/set-up-mac
+  #       with:
+  #         IMAGE: ${{ needs.set-image.outputs.IMAGE }}
+
+  #     - name: script
+  #       run: |
+  #         PYTHONUNBUFFERED=x .github/scripts/check-each-crate.py ${{ matrix.index }} ${{ strategy.job-total }} True
 
   confirm-required-test-misc-jobs-passed:
     runs-on: ubuntu-latest
@@ -408,6 +392,7 @@ jobs:
       - test-node-metrics
       - check-tracing
       - cargo-check-each-crate
+      - test-deterministic-wasm
       # - cargo-hfuzz remove from required for now, as it's flaky
     steps:
       - run: echo '### Good job! All the required tests passed 🚀' >> $GITHUB_STEP_SUMMARY
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8b4ca48150b1..43123cdbfc41 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -288,3 +288,8 @@ cancel-pipeline-build-short-benchmark:
   extends: .cancel-pipeline-template
   needs:
     - job: build-short-benchmark
+
+cancel-pipeline-cargo-check-each-crate-macos:
+  extends: .cancel-pipeline-template
+  needs:
+    - job: cargo-check-each-crate-macos
\ No newline at end of file
diff --git a/.gitlab/pipeline/test.yml b/.gitlab/pipeline/test.yml
index 00a0aa2c9771..0879870ae13c 100644
--- a/.gitlab/pipeline/test.yml
+++ b/.gitlab/pipeline/test.yml
@@ -153,3 +153,25 @@ quick-benchmarks-omni:
   script:
     - time cargo build --locked --quiet --release -p asset-hub-westend-runtime --features runtime-benchmarks
     - time cargo run --locked --release -p frame-omni-bencher --quiet -- v1 benchmark pallet --runtime target/release/wbuild/asset-hub-westend-runtime/asset_hub_westend_runtime.compact.compressed.wasm --all --steps 2 --repeat 1 --quiet
+
+cargo-check-each-crate-macos:
+  stage: test
+  extends:
+    - .docker-env
+    - .common-refs
+    - .run-immediately
+    # - .collect-artifacts
+  before_script:
+    # skip timestamp script, the osx bash doesn't support printf %()T
+    - !reference [.job-switcher, before_script]
+    - !reference [.rust-info-script, script]
+    - !reference [.pipeline-stopper-vars, script]
+  variables:
+    SKIP_WASM_BUILD: 1
+  script:
+    # TODO: use parallel jobs, as per cargo-check-each-crate, once more Mac runners are available
+    # - time ./scripts/ci/gitlab/check-each-crate.py 1 1
+    - time cargo check --workspace --locked
+  timeout: 2h
+  tags:
+    - osx