.gitlab-ci.common.yml

@@ -8,6 +8,9 @@ workflow:
       when: never
     - when: always
 
+variables:
+  GIT_SUBMODULE_STRATEGY: recursive
+
 stages:
   - versioning
   - prepare
@@ -20,10 +23,11 @@ stages:
 versioning:
   stage: versioning
   image: bitnami/git
+  variables:
+    GIT_SUBMODULE_STRATEGY: normal
   script:
     # Unshallowing ensures that 'git log' works
-    # - git fetch --unshallow
-    - git fetch --depth=1000
+    - git fetch --unshallow
     - echo BASE_IMAGE_2004=${CI_REGISTRY_IMAGE}/base_2004:$(git log -n 1 --pretty=format:%H -- docker/ubuntu_20_04_base) > versions.env
     - echo BASE_IMAGE_2204=${CI_REGISTRY_IMAGE}/base_2204:$(git log -n 1 --pretty=format:%H -- docker/ubuntu_22_04_base) >> versions.env
     - cat versions.env
@@ -37,6 +41,8 @@ versioning:
   image: docker:20.10
   services:
     - docker:20.10-dind
+  variables:
+    GIT_SUBMODULE_STRATEGY: normal
   before_script:
     - echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
   script:
@@ -48,9 +54,13 @@ versioning:
   # Skip the job if there are no changes to the Docker file. This shortcut only
   # works for push and merge request jobs.
   # A manual pipeline run will thus create missing docker images.
-  rules:
-    - changes:
-      - $DOCKER_FILE
+  #
+  # This is disabled since the detections of the changes by GitLab seems flaky.
+  # TODO(AST-887) Reenable this to test whether it's no longer flaky.
+  #
+  #rules:
+  #  - changes:
+  #    - $DOCKER_FILE
 
 prepare-base-2004:
   extends: .prepare
@@ -78,13 +88,10 @@ prepare-base-2204:
       optional: true
   image: $BASE_IMAGE_2204
 
-clang-format:
+format:
   extends: .needs-2004
   stage: linting
   script:
-    # Explicitly checking out submodules might become redundant
-    # once git fetch --unshallow works.
-    - git submodule update --init --recursive --checkout --depth 1
     - ./scripts/run-format.sh
 
 .build: