ci: Wait for 'check-commit-log' before continuing

The check-commit-log is quick, and to get a result early is helpful as
one can then more quickly check for failures via the report provided via
the JUnit report.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1491>
This commit is contained in:
Jonas Ådahl 2020-11-06 18:07:07 +01:00 committed by Marge Bot
parent 09a09dd102
commit e2945a525c
2 changed files with 5 additions and 6 deletions

View File

@ -25,8 +25,7 @@ check_commit_log:
GIT_DEPTH: "100" GIT_DEPTH: "100"
script: script:
- ./.gitlab-ci/check-commit-log.sh - ./.gitlab-ci/check-commit-log.sh
only: <<: *only_default
- merge_requests
artifacts: artifacts:
expire_in: 1 week expire_in: 1 week
paths: paths:
@ -90,7 +89,7 @@ no_template_check:
build: build:
image: registry.gitlab.gnome.org/gnome/mutter/master:v4 image: registry.gitlab.gnome.org/gnome/mutter/master:v4
stage: build stage: build
needs: [] needs: ["check_commit_log"]
before_script: before_script:
- .gitlab-ci/checkout-mutter.sh - .gitlab-ci/checkout-mutter.sh
- meson mutter mutter/build --prefix=/usr -Dtests=false - meson mutter mutter/build --prefix=/usr -Dtests=false
@ -126,7 +125,7 @@ test:
flatpak: flatpak:
stage: build stage: build
needs: [] needs: ["check_commit_log"]
variables: variables:
SUBPROJECT: "subprojects/extensions-app" SUBPROJECT: "subprojects/extensions-app"
# Your manifest path # Your manifest path

View File

@ -1,8 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
if [ -z "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then if [ -z "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
echo Cannot review non-merge request echo This is not a merge request, skipping
exit 1 exit 0
fi fi
git fetch $CI_MERGE_REQUEST_PROJECT_URL.git $CI_MERGE_REQUEST_TARGET_BRANCH_NAME git fetch $CI_MERGE_REQUEST_PROJECT_URL.git $CI_MERGE_REQUEST_TARGET_BRANCH_NAME