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>
This commit is contained in:
parent
c865d1b414
commit
2c812550fa
@ -185,6 +185,8 @@ potfile_js_check:
|
|||||||
build:
|
build:
|
||||||
stage: build
|
stage: build
|
||||||
needs: ["check_commit_log"]
|
needs: ["check_commit_log"]
|
||||||
|
variables:
|
||||||
|
GIT_SUBMODULE_STRATEGY: normal
|
||||||
before_script:
|
before_script:
|
||||||
- .gitlab-ci/checkout-mutter.sh
|
- .gitlab-ci/checkout-mutter.sh
|
||||||
- meson mutter mutter/build --prefix=/usr
|
- meson mutter mutter/build --prefix=/usr
|
||||||
@ -203,6 +205,7 @@ test:
|
|||||||
stage: test
|
stage: test
|
||||||
needs: ["build"]
|
needs: ["build"]
|
||||||
variables:
|
variables:
|
||||||
|
GIT_SUBMODULE_STRATEGY: normal
|
||||||
XDG_RUNTIME_DIR: "$CI_PROJECT_DIR/runtime-dir"
|
XDG_RUNTIME_DIR: "$CI_PROJECT_DIR/runtime-dir"
|
||||||
NO_AT_BRIDGE: "1"
|
NO_AT_BRIDGE: "1"
|
||||||
before_script:
|
before_script:
|
||||||
@ -225,6 +228,8 @@ test-coverity:
|
|||||||
needs: ["build"]
|
needs: ["build"]
|
||||||
stage: analyze
|
stage: analyze
|
||||||
allow_failure: true
|
allow_failure: true
|
||||||
|
variables:
|
||||||
|
GIT_SUBMODULE_STRATEGY: normal
|
||||||
before_script:
|
before_script:
|
||||||
- meson install -C mutter/build
|
- meson install -C mutter/build
|
||||||
script:
|
script:
|
||||||
@ -260,6 +265,7 @@ dist:
|
|||||||
variables:
|
variables:
|
||||||
XDG_RUNTIME_DIR: "$CI_PROJECT_DIR/runtime-dir"
|
XDG_RUNTIME_DIR: "$CI_PROJECT_DIR/runtime-dir"
|
||||||
NO_AT_BRIDGE: "1"
|
NO_AT_BRIDGE: "1"
|
||||||
|
GIT_SUBMODULE_STRATEGY: normal
|
||||||
stage: deploy
|
stage: deploy
|
||||||
needs: ["build"]
|
needs: ["build"]
|
||||||
before_script:
|
before_script:
|
||||||
|
Loading…
Reference in New Issue
Block a user