mirror of
https://gitlab.archlinux.org/archlinux/archlinux-docker.git
synced 2025-08-06 22:27:29 +02:00
gitlab-ci: de-duplicate matrix option
Just push the parallel/matrix into the templates. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
This commit is contained in:
parent
5ec09f5357
commit
9d3774ce35
@ -58,6 +58,9 @@ get_version:
|
|||||||
|
|
||||||
.rootfs:
|
.rootfs:
|
||||||
stage: rootfs
|
stage: rootfs
|
||||||
|
parallel:
|
||||||
|
matrix:
|
||||||
|
- GROUP: [base, base-devel]
|
||||||
before_script:
|
before_script:
|
||||||
- pacman -Syu --noconfirm make fakechroot fakeroot
|
- pacman -Syu --noconfirm make fakechroot fakeroot
|
||||||
- pacman -Sdd --noconfirm devtools
|
- pacman -Sdd --noconfirm devtools
|
||||||
@ -75,9 +78,6 @@ rootfs:
|
|||||||
- releases
|
- releases
|
||||||
- schedules
|
- schedules
|
||||||
- tags
|
- tags
|
||||||
parallel:
|
|
||||||
matrix:
|
|
||||||
- GROUP: [base, base-devel]
|
|
||||||
|
|
||||||
rootfs:secure:
|
rootfs:secure:
|
||||||
extends: .rootfs
|
extends: .rootfs
|
||||||
@ -90,12 +90,12 @@ rootfs:secure:
|
|||||||
except:
|
except:
|
||||||
- tags
|
- tags
|
||||||
- releases
|
- releases
|
||||||
parallel:
|
|
||||||
matrix:
|
|
||||||
- GROUP: [base, base-devel]
|
|
||||||
|
|
||||||
.image:
|
.image:
|
||||||
stage: image
|
stage: image
|
||||||
|
parallel:
|
||||||
|
matrix:
|
||||||
|
- GROUP: [base, base-devel]
|
||||||
tags:
|
tags:
|
||||||
- vm
|
- vm
|
||||||
before_script:
|
before_script:
|
||||||
@ -114,9 +114,6 @@ image:build:
|
|||||||
- releases
|
- releases
|
||||||
- schedules
|
- schedules
|
||||||
- tags
|
- tags
|
||||||
parallel:
|
|
||||||
matrix:
|
|
||||||
- GROUP: [base, base-devel]
|
|
||||||
before_script:
|
before_script:
|
||||||
- pacman -Syu --noconfirm podman
|
- pacman -Syu --noconfirm podman
|
||||||
- podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
|
- podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
|
||||||
@ -131,9 +128,6 @@ image:build:secure:
|
|||||||
- schedules
|
- schedules
|
||||||
except:
|
except:
|
||||||
- tags
|
- tags
|
||||||
parallel:
|
|
||||||
matrix:
|
|
||||||
- GROUP: [base, base-devel]
|
|
||||||
before_script:
|
before_script:
|
||||||
- pacman -Syu --noconfirm podman
|
- pacman -Syu --noconfirm podman
|
||||||
- podman login -u "$GITLAB_PROJECT_USER" -p "$GITLAB_PROJECT_TOKEN" "$CI_REGISTRY"
|
- podman login -u "$GITLAB_PROJECT_USER" -p "$GITLAB_PROJECT_TOKEN" "$CI_REGISTRY"
|
||||||
@ -149,9 +143,6 @@ image:publish:secure:
|
|||||||
- vm
|
- vm
|
||||||
only:
|
only:
|
||||||
- tags
|
- tags
|
||||||
parallel:
|
|
||||||
matrix:
|
|
||||||
- GROUP: [base, base-devel]
|
|
||||||
before_script:
|
before_script:
|
||||||
- pacman -Syu --noconfirm podman
|
- pacman -Syu --noconfirm podman
|
||||||
- podman login -u "$DOCKERHUB_USERNAME" -p "$DOCKERHUB_ACCESS_TOKEN" "docker.io"
|
- podman login -u "$DOCKERHUB_USERNAME" -p "$DOCKERHUB_ACCESS_TOKEN" "docker.io"
|
||||||
|
Loading…
Reference in New Issue
Block a user