aboutsummaryrefslogtreecommitdiffstats
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorKevin Daudt <kdaudt@alpinelinux.org>2019-10-19 13:08:08 +0000
committerKevin Daudt <kdaudt@alpinelinux.org>2019-10-19 13:09:05 +0000
commit29b127feb49c762bf2b8d0a0d65c118e39b8a1df (patch)
tree472a12e399aecfdb2e4c2cf629961d7dda04b24a /.gitlab-ci.yml
parentf5e1b468d90a7e56648b20176fe1028cd72a0a7a (diff)
downloadaports-29b127feb49c762bf2b8d0a0d65c118e39b8a1df.tar.gz
aports-29b127feb49c762bf2b8d0a0d65c118e39b8a1df.tar.bz2
aports-29b127feb49c762bf2b8d0a0d65c118e39b8a1df.tar.xz
Revert "gitlab-ci: remove git fetch before_script"
Decided it's better to do it in one place than repeating the logic on multiple places. This reverts commit fb5b97d0912f687b7e83836bfa52359d81c0ef76.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml7
1 files changed, 7 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a2deeedb7a..4294ab0ead 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,6 +6,13 @@ variables:
GIT_STRATEGY: fetch
GIT_DEPTH: "0"
+default:
+ # Make sure master points to the correct upstream commit
+ before_script:
+ - >
+ git fetch $CI_MERGE_REQUEST_PROJECT_URL
+ +refs/heads/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME:refs/heads/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
+
lint:
stage: lint
image: alpinelinux/apkbuild-lint-tools:latest