From bb5869f8dfc53cff148e2cf06d57e442cdcd9413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Sun, 10 Jul 2022 23:04:08 +0200 Subject: [PATCH] ci: Instruct gitlab to checkout submodules ... instead of doing it in the script. This will become important when we switch to a CI image with an updated meson version that no longer checks out submodules as part of the dist command. Part-of: --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 14da0c22..a53e93fe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -132,8 +132,8 @@ fedora-build: stage: build needs: - build-fedora-container - before_script: - - git submodule update --init + variables: + GIT_SUBMODULE_STRATEGY: normal script: - meson setup build --werror -Dextension_set=all -Dclassic_mode=true - meson compile -C build @@ -150,8 +150,8 @@ fedora-dist: stage: deploy needs: - fedora-build - before_script: - - git submodule update --init + variables: + GIT_SUBMODULE_STRATEGY: normal script: - meson dist -C build rules: