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 | |
parent | a686cd5d636b4bb7da332dd4ea5c71322084aac8 (diff) | |
download | alpine_aports-4beb7d21a627964257f1e6f80647274fff1f184a.tar.bz2 alpine_aports-4beb7d21a627964257f1e6f80647274fff1f184a.tar.xz alpine_aports-4beb7d21a627964257f1e6f80647274fff1f184a.zip |
gitlab-ci: update to latest changes
-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: | |||
2 | - lint | 2 | - lint |
3 | - build | 3 | - build |
4 | 4 | ||
5 | variables: | ||
6 | GIT_STRATEGY: fetch | ||
7 | GIT_DEPTH: "0" | ||
8 | |||
9 | default: | ||
10 | # Make sure master points to the correct upstream commit | ||
11 | before_script: | ||
12 | - > | ||
13 | git fetch $CI_MERGE_REQUEST_PROJECT_URL | ||
14 | +refs/heads/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME:refs/heads/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME | ||
15 | |||
5 | lint: | 16 | lint: |
6 | stage: lint | 17 | stage: lint |
7 | image: alpinelinux/apkbuild-lint-tools:latest | 18 | image: alpinelinux/apkbuild-lint-tools:latest |
@@ -19,11 +30,21 @@ lint: | |||
19 | image: alpinelinux/alpine-gitlab-ci:latest | 30 | image: alpinelinux/alpine-gitlab-ci:latest |
20 | script: | 31 | script: |
21 | - build.sh | 32 | - build.sh |
33 | - cp -ar ~/packages packages/ | ||
34 | - mkdir -p keys | ||
35 | - cp ~/.abuild/*.rsa.pub keys/ | ||
36 | artifacts: | ||
37 | paths: | ||
38 | - packages/ | ||
39 | - keys/ | ||
40 | expire_in: 1 day | ||
22 | only: | 41 | only: |
23 | - merge_requests | 42 | - merge_requests |
24 | 43 | ||
25 | build-x86_64: | 44 | build-x86_64: |
26 | extends: .build | 45 | extends: .build |
46 | artifacts: | ||
47 | name: MR${CI_MERGE_REQUEST_ID}_x86_64 | ||
27 | tags: | 48 | tags: |
28 | - docker-alpine | 49 | - docker-alpine |
29 | - ci-build | 50 | - ci-build |
@@ -34,6 +55,8 @@ build-x86: | |||
34 | image: | 55 | image: |
35 | name: alpinelinux/alpine-gitlab-ci:latest-x86 | 56 | name: alpinelinux/alpine-gitlab-ci:latest-x86 |
36 | entrypoint: ["linux32", "sh", "-c"] | 57 | entrypoint: ["linux32", "sh", "-c"] |
58 | artifacts: | ||
59 | name: MR${CI_MERGE_REQUEST_ID}_x86 | ||
37 | tags: | 60 | tags: |
38 | - docker-alpine | 61 | - docker-alpine |
39 | - ci-build | 62 | - ci-build |
@@ -41,6 +64,8 @@ build-x86: | |||
41 | 64 | ||
42 | build-s390x: | 65 | build-s390x: |
43 | extends: .build | 66 | extends: .build |
67 | artifacts: | ||
68 | name: MR${CI_MERGE_REQUEST_ID}_s390x | ||
44 | tags: | 69 | tags: |
45 | - docker-alpine | 70 | - docker-alpine |
46 | - ci-build | 71 | - ci-build |
@@ -48,6 +73,8 @@ build-s390x: | |||
48 | 73 | ||
49 | build-ppc64le: | 74 | build-ppc64le: |
50 | extends: .build | 75 | extends: .build |
76 | artifacts: | ||
77 | name: MR${CI_MERGE_REQUEST_ID}_ppc64le | ||
51 | tags: | 78 | tags: |
52 | - docker-alpine | 79 | - docker-alpine |
53 | - ci-build | 80 | - ci-build |
@@ -61,3 +88,12 @@ build-aarch64: | |||
61 | - docker-alpine | 88 | - docker-alpine |
62 | - ci-build | 89 | - ci-build |
63 | - aarch64 | 90 | - aarch64 |
91 | |||
92 | build-armv7: | ||
93 | extends: .build | ||
94 | artifacts: | ||
95 | name: MR${CI_MERGE_REQUEST_ID}_armv7 | ||
96 | tags: | ||
97 | - docker-alpine | ||
98 | - ci-build | ||
99 | - armv7 | ||