diff options
author | Kevin Daudt <kdaudt@alpinelinux.org> | 2019-10-14 23:04:16 +0000 |
---|---|---|
committer | Kevin Daudt <kdaudt@alpinelinux.org> | 2019-10-20 15:42:17 +0000 |
commit | 4beb7d21a627964257f1e6f80647274fff1f184a (patch) | |
tree | 8d076de87933481fb7d4fbe6c9fd68b7d523900f /.gitlab-ci.yml | |
parent | a686cd5d636b4bb7da332dd4ea5c71322084aac8 (diff) | |
download | aports-4beb7d21a627964257f1e6f80647274fff1f184a.tar.gz aports-4beb7d21a627964257f1e6f80647274fff1f184a.tar.bz2 aports-4beb7d21a627964257f1e6f80647274fff1f184a.tar.xz |
gitlab-ci: update to latest changes
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 60e8694e55..4294ab0ead 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,6 +2,17 @@ stages: - lint - build +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 @@ -19,11 +30,21 @@ lint: image: alpinelinux/alpine-gitlab-ci:latest script: - build.sh + - cp -ar ~/packages packages/ + - mkdir -p keys + - cp ~/.abuild/*.rsa.pub keys/ + artifacts: + paths: + - packages/ + - keys/ + expire_in: 1 day only: - merge_requests build-x86_64: extends: .build + artifacts: + name: MR${CI_MERGE_REQUEST_ID}_x86_64 tags: - docker-alpine - ci-build @@ -34,6 +55,8 @@ build-x86: image: name: alpinelinux/alpine-gitlab-ci:latest-x86 entrypoint: ["linux32", "sh", "-c"] + artifacts: + name: MR${CI_MERGE_REQUEST_ID}_x86 tags: - docker-alpine - ci-build @@ -41,6 +64,8 @@ build-x86: build-s390x: extends: .build + artifacts: + name: MR${CI_MERGE_REQUEST_ID}_s390x tags: - docker-alpine - ci-build @@ -48,6 +73,8 @@ build-s390x: build-ppc64le: extends: .build + artifacts: + name: MR${CI_MERGE_REQUEST_ID}_ppc64le tags: - docker-alpine - ci-build @@ -61,3 +88,12 @@ build-aarch64: - docker-alpine - ci-build - aarch64 + +build-armv7: + extends: .build + artifacts: + name: MR${CI_MERGE_REQUEST_ID}_armv7 + tags: + - docker-alpine + - ci-build + - armv7 |