From 5524c1166c6b6174b42b57785fe7fbf5982b09f3 Mon Sep 17 00:00:00 2001
From: Alexander Samusev <41779041+alvicsam@users.noreply.github.com>
Date: Wed, 18 Sep 2024 13:32:28 +0200
Subject: [PATCH] [ci] Remove cargo check osx from gitlab (#5752)
PR removes cargo check job that runs on osx runner from gitlab and moves
`cargo-check-each-crate-macos` job to be required
cc https://github.com/paritytech/ci_cd/issues/1037
---
.github/workflows/tests-misc.yml | 4 ++--
.gitlab-ci.yml | 27 +++++++++++----------------
.gitlab/pipeline/test.yml | 22 ----------------------
3 files changed, 13 insertions(+), 40 deletions(-)
diff --git a/.github/workflows/tests-misc.yml b/.github/workflows/tests-misc.yml
index 0f2b617b847..dc6128a3f6e 100644
--- a/.github/workflows/tests-misc.yml
+++ b/.github/workflows/tests-misc.yml
@@ -14,7 +14,6 @@ concurrency:
# Jobs in this workflow depend on each other, only for limiting peak amount of spawned workers
jobs:
-
preflight:
uses: ./.github/workflows/reusable-preflight.yml
@@ -321,7 +320,7 @@ jobs:
cargo-check-all-crate-macos:
timeout-minutes: 30
- needs: [ preflight ]
+ needs: [preflight]
runs-on: parity-macos
env:
SKIP_WASM_BUILD: 1
@@ -366,6 +365,7 @@ jobs:
- check-tracing
- cargo-check-each-crate
- test-deterministic-wasm
+ - cargo-check-all-crate-macos
# - cargo-hfuzz remove from required for now, as it's flaky
if: always() && !cancelled()
steps:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 43123cdbfc4..5c6b3928b46 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,7 @@ workflow:
- if: $CI_COMMIT_BRANCH
variables:
- CI_IMAGE: !reference [ .ci-unified, variables, CI_IMAGE ]
+ CI_IMAGE: !reference [.ci-unified, variables, CI_IMAGE]
# BUILDAH_IMAGE is defined in group variables
BUILDAH_COMMAND: "buildah --storage-driver overlay2"
RELENG_SCRIPTS_BRANCH: "master"
@@ -39,7 +39,7 @@ default:
- runner_system_failure
- unknown_failure
- api_failure
- cache: { }
+ cache: {}
interruptible: true
.collect-artifacts:
@@ -68,8 +68,8 @@ default:
.common-before-script:
before_script:
- - !reference [ .job-switcher, before_script ]
- - !reference [ .pipeline-stopper-vars, script ]
+ - !reference [.job-switcher, before_script]
+ - !reference [.pipeline-stopper-vars, script]
.job-switcher:
before_script:
@@ -78,8 +78,8 @@ default:
.kubernetes-env:
image: "${CI_IMAGE}"
before_script:
- - !reference [ .common-before-script, before_script ]
- - !reference [ .prepare-env, before_script ]
+ - !reference [.common-before-script, before_script]
+ - !reference [.prepare-env, before_script]
tags:
- kubernetes-parity-build
@@ -107,12 +107,12 @@ default:
.docker-env:
image: "${CI_IMAGE}"
variables:
- FL_FORKLIFT_VERSION: !reference [ .forklift, variables, FL_FORKLIFT_VERSION ]
+ FL_FORKLIFT_VERSION: !reference [.forklift, variables, FL_FORKLIFT_VERSION]
before_script:
- - !reference [ .common-before-script, before_script ]
- - !reference [ .prepare-env, before_script ]
- - !reference [ .rust-info-script, script ]
- - !reference [ .forklift-cache, before_script ]
+ - !reference [.common-before-script, before_script]
+ - !reference [.prepare-env, before_script]
+ - !reference [.rust-info-script, script]
+ - !reference [.forklift-cache, before_script]
tags:
- linux-docker
@@ -288,8 +288,3 @@ 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 0879870ae13..00a0aa2c977 100644
--- a/.gitlab/pipeline/test.yml
+++ b/.gitlab/pipeline/test.yml
@@ -153,25 +153,3 @@ 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
--
GitLab