archive/bramw_baserow
1
0
Fork 0
mirror of https://gitlab.com/bramw/baserow.git synced 2025-04-04 21:25:24 +00:00
Code Issues Projects Releases Wiki Activity

Resolve "Forked MR pipelines no longer work"

Browse source
This commit is contained in:
Nigel Gott 2022-03-11 13:26:01 +00:00
parent 864816e2ca
commit 97eb2d3112
2 changed files with 9 additions and 4 deletions
.gitlab-ci.yml
.gitlab/ci_includes
jobs.yml

6
.gitlab-ci.yml
View file

@ -191,8 +191,8 @@ variables:
value: "no"
description: "If set to yes then all images will re-pull their base images and rebuild entirely from scratch with no caching."
ENABLE_JOB_SKIPPING:
value: "true"
description: "If set to false then tests and lints will be forced to run and not use previously cached results."
value: "false"
description: "If set to true then tests and lints will skipped when safe to do so."
ENABLE_COVERAGE:
value: "true"
description: "If set to false then tests will not generate coverage or testing reports used by gitlab to show nicer MRs."
@ -245,7 +245,7 @@ variables:
CLOUDRON_DOCKERFILE_PATH: $CI_PROJECT_DIR/deploy/cloudron/Dockerfile
HEROKU_DOCKERFILE_PATH: $CI_PROJECT_DIR/heroku.Dockerfile
# The image path for the helper CI util image that will be built and pushed to.
CI_UTIL_IMAGE: $CI_IMAGE_REPO/ci_util_image:latest
CI_UTIL_IMAGE: registry.gitlab.com/bramw/baserow/ci/ci_util_image:latest
# ==================================== CI UTIL ====================================

7
.gitlab/ci_includes/jobs.yml
View file

@ -434,6 +434,11 @@
exit 1
fi
if [[ -z "$PROJECT_READ_ONLY_API_TOKEN" && "$ENABLE_JOB_SKIPPING" = "true" ]]; then
echo -e "$RED Disabling job skipping as PROJECT_READ_ONLY_API_TOKEN env variable not set. $CLEAR"
ENABLE_JOB_SKIPPING=false
fi
# If we are doing a full rebuild then force run all the linting and tests.
# Always do this on master as we are always doing a full image rebuild and hence
# always need to run the tests.
@ -448,7 +453,7 @@
if [[ "$COMMIT_GITLAB_JOBS" ]]; then
echo -e "\e[0Ksection_start:`date +%s`:$COMMIT_HASH$JOB_NAME[collapsed=true]\r\e[0KRaw job status download for $JOB_NAME and $COMMIT_HASH"
echo "Got these job statuses: $COMMIT_GITLAB_JOBS"
JOB_ID=$(echo $COMMIT_GITLAB_JOBS| jq "[.[] | select(.status == \"success\")][0].id")
JOB_ID=$(echo $COMMIT_GITLAB_JOBS| jq "[.[] | select(.status == \"success\")][0].id" || '')
echo -e "\e[0Ksection_end:`date +%s`:$COMMIT_HASH$JOB_NAME\r\e[0K"
# Check if JOB_ID is an integer (POSIX compliant way)