ci: Utilize before_script in GitLab CI/CD. (#283)

serious-scaffold · Jan 28, 2024 · 7c01ac7 · 7c01ac7
1 parent c8ec825
commit 7c01ac7
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 10 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -3,5 +3,7 @@ stages:
   - ci
   - release
 default:
+  before_script:
+    - env | sort
   image: ${CI_REGISTRY_IMAGE}:dev-py3.12
 include: .gitlab/ci/**.yml
diff --git a/.gitlab/ci/ci.yml b/.gitlab/ci/ci.yml
@@ -19,7 +19,6 @@ ci:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
   script:
-    - env | sort
     - make dev
     - make lint test doc build
   stage: ci
diff --git a/.gitlab/ci/release.yml b/.gitlab/ci/release.yml
@@ -7,7 +7,6 @@ doc:
   rules:
     - if: $CI_COMMIT_TAG =~ /^v?(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-?(a|b|rc)(0|[1-9][0-9]*)?)?$/
   script:
-    - env | sort
     - make dev-doc
     - make doc
     - make release-notes > release-notes.md
@@ -18,7 +17,6 @@ package:
   rules:
     - if: $CI_COMMIT_TAG =~ /^v?(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-?(a|b|rc)(0|[1-9][0-9]*)?)?$/
   script:
-    - env | sort
     - make publish
   stage: release
 pages:
@@ -31,7 +29,7 @@ pages:
   rules:
     - if: $CI_COMMIT_TAG =~ /^v?(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-?(a|b|rc)(0|[1-9][0-9]*)?)?$/
   script:
-    - env | sort
+    - echo "Running the pages job."
   stage: release
 release:
   image: registry.gitlab.com/gitlab-org/release-cli:latest
@@ -43,5 +41,5 @@ release:
   rules:
     - if: $CI_COMMIT_TAG =~ /^v?(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-?(a|b|rc)(0|[1-9][0-9]*)?)?$/
   script:
-    - env | sort
+    - echo "Running the release job."
   stage: release
diff --git a/...'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab-ci.yml[% endif %].jinja b/...'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab-ci.yml[% endif %].jinja
@@ -3,5 +3,7 @@ stages:
   - ci
   - release
 default:
+  before_script:
+    - env | sort
   image: ${CI_REGISTRY_IMAGE}:dev-py{{ default_py }}
 include: .gitlab/ci/**.yml
diff --git a/...tlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/ci/ci.yml.jinja b/...tlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/ci/ci.yml.jinja
@@ -30,7 +30,6 @@ ci:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
   script:
-    - env | sort
     - make dev
     - make lint test doc build
   stage: ci
diff --git a/...itlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/ci/release.yml b/...itlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/ci/release.yml
@@ -7,7 +7,6 @@ doc:
   rules:
     - if: $CI_COMMIT_TAG =~ /^v?(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-?(a|b|rc)(0|[1-9][0-9]*)?)?$/
   script:
-    - env | sort
     - make dev-doc
     - make doc
     - make release-notes > release-notes.md
@@ -18,7 +17,6 @@ package:
   rules:
     - if: $CI_COMMIT_TAG =~ /^v?(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-?(a|b|rc)(0|[1-9][0-9]*)?)?$/
   script:
-    - env | sort
     - make publish
   stage: release
 pages:
@@ -31,7 +29,7 @@ pages:
   rules:
     - if: $CI_COMMIT_TAG =~ /^v?(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-?(a|b|rc)(0|[1-9][0-9]*)?)?$/
   script:
-    - env | sort
+    - echo "Running the pages job."
   stage: release
 release:
   image: registry.gitlab.com/gitlab-org/release-cli:latest
@@ -43,5 +41,5 @@ release:
   rules:
     - if: $CI_COMMIT_TAG =~ /^v?(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-?(a|b|rc)(0|[1-9][0-9]*)?)?$/
   script:
-    - env | sort
+    - echo "Running the release job."
   stage: release