1
0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-31 04:43:06 +02:00

CI: Extend submodule workaround to most jobs that run the test suite

Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2024-02-07 13:46:11 +00:00 committed by Philip Withnall
parent d7601f7eed
commit a7702505e0

@ -111,8 +111,7 @@ variables:
- cp -r $HOME/subprojects/* subprojects/ - cp -r $HOME/subprojects/* subprojects/
# FIXME: Work around https://gitlab.com/gitlab-org/gitlab/-/issues/391756 # FIXME: Work around https://gitlab.com/gitlab-org/gitlab/-/issues/391756
.only-default-with-git: .with-git:
extends: .only-default
before_script: before_script:
- rm -rf subprojects/gvdb - rm -rf subprojects/gvdb
- git config --global --add safe.directory "${PWD}" - git config --global --add safe.directory "${PWD}"
@ -122,7 +121,9 @@ variables:
GIT_SUBMODULE_DEPTH: 1 GIT_SUBMODULE_DEPTH: 1
style-check-advisory: style-check-advisory:
extends: .only-default-with-git extends:
- .only-default
- .with-git
image: $DEBIAN_IMAGE image: $DEBIAN_IMAGE
stage: style-check stage: style-check
allow_failure: true allow_failure: true
@ -131,12 +132,13 @@ style-check-advisory:
- .gitlab-ci/run-check-todos.sh - .gitlab-ci/run-check-todos.sh
sh-and-py-check: sh-and-py-check:
extends: .only-default extends:
- .only-default
- .with-git
image: $DEBIAN_IMAGE image: $DEBIAN_IMAGE
stage: style-check stage: style-check
allow_failure: false allow_failure: false
script: script:
- git config --global --add safe.directory "${PWD}"
- tests/shellcheck.sh - tests/shellcheck.sh
- tests/black.sh - tests/black.sh
- tests/flake8.sh - tests/flake8.sh
@ -148,7 +150,9 @@ sh-and-py-check:
- "**/*.sh" - "**/*.sh"
style-check-mandatory: style-check-mandatory:
extends: .only-default-with-git extends:
- .only-default
- .with-git
image: $DEBIAN_IMAGE image: $DEBIAN_IMAGE
stage: style-check stage: style-check
allow_failure: false allow_failure: false
@ -161,6 +165,7 @@ fedora-x86_64:
extends: extends:
- .build-linux - .build-linux
- .only-default-and-merges - .only-default-and-merges
- .with-git
image: $FEDORA_IMAGE image: $FEDORA_IMAGE
stage: build stage: build
needs: [] needs: []
@ -211,6 +216,7 @@ debian-stable-x86_64:
extends: extends:
- .build-linux - .build-linux
- .only-default - .only-default
- .with-git
image: $DEBIAN_IMAGE image: $DEBIAN_IMAGE
stage: build stage: build
needs: [] needs: []
@ -242,6 +248,7 @@ debian-stable-x86_64:
hurd-i386: hurd-i386:
extends: extends:
- .only-schedules-or-manual - .only-schedules-or-manual
- .with-git
stage: build stage: build
tags: tags:
- hurd - hurd
@ -278,6 +285,7 @@ muslc-alpine-x86_64:
extends: extends:
- .build-linux - .build-linux
- .only-schedules-or-manual - .only-schedules-or-manual
- .with-git
image: $ALPINE_IMAGE image: $ALPINE_IMAGE
stage: build stage: build
needs: [] needs: []
@ -347,6 +355,7 @@ G_DISABLE_ASSERT:
extends: extends:
- .build-linux - .build-linux
- .only-schedules-or-manual - .only-schedules-or-manual
- .with-git
image: $FEDORA_IMAGE image: $FEDORA_IMAGE
stage: build stage: build
needs: [] needs: []
@ -381,6 +390,7 @@ valgrind:
extends: extends:
- .build-linux - .build-linux
- .only-schedules-or-manual - .only-schedules-or-manual
- .with-git
image: $FEDORA_IMAGE image: $FEDORA_IMAGE
stage: analysis stage: analysis
needs: [] needs: []