ci: move image into default and ignore image for windows jobs

MatrixAI · Sep 26, 2022 · d00dd15 · d00dd15
1 parent c918000
commit d00dd15
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -17,6 +17,7 @@ variables:
   HOMEBREW_CACHE: "${CI_PROJECT_DIR}/tmp/Homebrew"
 
 default:
+  image: registry.gitlab.com/matrixai/engineering/maintenance/gitlab-runner
   interruptible: true
   before_script:
     # Replace this in windows runners that use powershell
@@ -43,8 +44,6 @@ stages:
   - integration # Cross-platform application bundling, integration tests, and pre-release
   - release     # Cross-platform distribution and deployment
 
-image: registry.gitlab.com/matrixai/engineering/maintenance/gitlab-runner
-
 check:scratch:
   stage: check
   needs: [ ]
@@ -381,6 +380,9 @@ integration:linux:
     - if: $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+(?:-.*[0-9]+)?$/
 
 .integration:windows:
+  inherit:
+    default:
+      - interruptible
   stage: integration
   needs:
     - integration:builds

diff --git a/scripts/build-platforms-generate.sh b/scripts/build-platforms-generate.sh
@@ -28,6 +28,7 @@ variables:
   HOMEBREW_CACHE: "${CI_PROJECT_DIR}/tmp/Homebrew"
 
 default:
+  image: registry.gitlab.com/matrixai/engineering/maintenance/gitlab-runner
   interruptible: true
   before_script:
     # Replace this in windows runners that use powershell
@@ -50,8 +51,6 @@ cache:
 
 stages:
   - build       # Cross-platform library compilation, unit tests
-
-image: registry.gitlab.com/matrixai/engineering/maintenance/gitlab-runner
 EOF
 
 printf "\n"
@@ -114,6 +113,9 @@ build:linux index:
   coverage: '/All files[^|]*\|[^|]*\s+([\d\.]+)/'
 
 .build:windows:
+  inherit:
+    default:
+      - interruptible
   stage: build
   needs: []
 EOF

diff --git a/scripts/check-test-generate.sh b/scripts/check-test-generate.sh
@@ -19,6 +19,7 @@ variables:
   npm_config_prefer_offline: "true"
 
 default:
+  image: registry.gitlab.com/matrixai/engineering/maintenance/gitlab-runner
   interruptible: true
   before_script:
     # Replace this in windows runners that use powershell
@@ -41,8 +42,6 @@ cache:
 
 stages:
   - check       # Linting, unit tests
-
-image: registry.gitlab.com/matrixai/engineering/maintenance/gitlab-runner
 EOF
 
 printf "\n"