diff options
| author | Florian Müllner <fmuellner@gnome.org> | 2022-07-10 20:27:00 +0200 |
|---|---|---|
| committer | Florian Müllner <fmuellner@gnome.org> | 2022-08-01 13:00:10 +0200 |
| commit | 2c812550fa3275bde9016f2b266003194b4db407 (patch) | |
| tree | fdb2bddc5940b95211beb69df145afbd2138c93f /.gitlab-ci.yml | |
| parent | c865d1b414e3df41a3d708aeb33b6aed3960abca (diff) | |
| download | gnome-shell-2c812550fa3275bde9016f2b266003194b4db407.tar.gz | |
ci: Instruct gitlab to checkout submodules
By default, gitlab skips checking out of submodules. So far this
didn't matter to us, as meson will initialize submodules as part
of setup.
It no longer does for the dist command however, and as we run it
from a separate job where the submodule checkout isn't preserved,
the job breaks with recent meson versions.
Fix this by instructing gitlab to checkout the submodule for all
jobs that need it.
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2371>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 609cdba06..dfe115c70 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -185,6 +185,8 @@ potfile_js_check: build: stage: build needs: ["check_commit_log"] + variables: + GIT_SUBMODULE_STRATEGY: normal before_script: - .gitlab-ci/checkout-mutter.sh - meson mutter mutter/build --prefix=/usr @@ -203,6 +205,7 @@ test: stage: test needs: ["build"] variables: + GIT_SUBMODULE_STRATEGY: normal XDG_RUNTIME_DIR: "$CI_PROJECT_DIR/runtime-dir" NO_AT_BRIDGE: "1" before_script: @@ -225,6 +228,8 @@ test-coverity: needs: ["build"] stage: analyze allow_failure: true + variables: + GIT_SUBMODULE_STRATEGY: normal before_script: - meson install -C mutter/build script: @@ -260,6 +265,7 @@ dist: variables: XDG_RUNTIME_DIR: "$CI_PROJECT_DIR/runtime-dir" NO_AT_BRIDGE: "1" + GIT_SUBMODULE_STRATEGY: normal stage: deploy needs: ["build"] before_script: |