From c16af90202845d9851e14726d5544b671280cf69 Mon Sep 17 00:00:00 2001
From: Alex Tercete <alex.tercete@arm.com>
Date: Wed, 11 Dec 2024 12:53:53 +0000
Subject: [PATCH] ci(bazelisk): use `ruleset` template from 1.x

---
 .gitlab-ci.yml | 97 +++++++-------------------------------------------
 1 file changed, 13 insertions(+), 84 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5aa46f1e..3eb7d6fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,22 +1,20 @@
 include:
-  - component: "${CI_SERVER_HOST}/ci/component/bazelisk/bazelisk@v1.0.0-beta.5"
+  - component: "${CI_SERVER_HOST}/ci/component/bazelisk/ruleset@v1.0.1"
     inputs:
       image: "${CI_REGISTRY_IMAGE}"
       tag: "${CI_COMMIT_SHA}"
-      variables: |
-        CI_PROJECT_DIR
-        CI_PROJECT_ID
-        CI_REMOTE_EXECUTOR
-        CI_REMOTE_CACHE
-        CI_REMOTE_HEADER
-        CI_REMOTE_JOBS
-        CI_BES_RESULTS_URL
-        CI_BES_BACKEND
-        CI_PROJECT_URL
-        CI_COMMIT_REF_NAME
-        CI_COMMIT_SHA
-        CI_SERVER_HOST
-        CI_LOCKFILE_MODE
+      needs:
+        - oci
+        - format-check
+      versions:
+        - 7.4.0
+        - 7.x
+      configs:
+        - local
+        # FIXME: enable remote builds
+        #- remote
+      oses:
+        - linux
 
 default:
   tags:
@@ -41,22 +39,6 @@ oci:
     - docker buildx build --tag="$CI_REGISTRY_IMAGE:$CI_COMMIT_SHA" --push --cache-from "type=registry,ref=$CI_REGISTRY_IMAGE:$CI_COMMIT_BEFORE_SHA" --build-arg BUILDKIT_INLINE_CACHE=1 .
   rules: !reference [.bazelisk, rules]
 
-.job:
-  extends: .bazelisk
-  needs:
-    - format-check
-  cache:
-    - !reference [.bazelisk, cache]
-    - key: "bazel-cache-${CI_PROJECT_ID}"
-      paths:
-        - ".cache/bazel/disk"
-        - ".cache/bazel/repo"
-  variables:
-    CI_LOCKFILE_MODE: error
-    CONFIG: local
-  script:
-    - cd "${ROOT}"; bazelisk test --config="${CONFIG}" //...
-
 format-check:
   stage: .pre
   extends: .job
@@ -66,59 +48,6 @@ format-check:
     # `rules_lint` uses non-hermetic Git unless we give it these arguments
     - bazelisk run //tools/format:format.check -- . --disable_git_attribute_checks
 
-config:
-  extends: .job
-  parallel:
-    matrix:
-      - ROOT:
-          - .
-          - e2e
-        CONFIG:
-          - local
-          # FIXME: enable remote builds
-          # - remote
-
-version:
-  extends: .job
-  variables:
-    CI_LOCKFILE_MODE: "off"
-  parallel:
-    matrix:
-      - ROOT:
-          - .
-          - e2e
-        USE_BAZEL_VERSION:
-          - 7.4.0
-          - 7.x
-
-# TODO: switch this out for `rules_semantic_release`
-semantic-release:
-  extends: .job
-  stage: .post
-  needs:
-    - config
-    - version
-  image: node:lts
-  cache:
-    - !reference [.job, cache]
-    - key:
-        prefix: "node"
-        files:
-          - package-lock.json
-      paths:
-        - node_modules
-        - .cache/npm
-  before_script:
-    - npm config --location project set cache "${CI_PROJECT_DIR}/.cache/npm"
-    - npm ci --prefer-offline
-  script:
-    - !reference [.bazelisk-fragment, rc]
-    - npx semantic-release
-  rules:
-    - if: $CI_COMMIT_TAG
-      when: never
-    - if: $CI_COMMIT_REF_PROTECTED == "true"
-
 pages:
   stage: deploy
   extends: .job
-- 
GitLab