Update .gitlab-ci.yml file

This commit is contained in:
Colin Walters 2023-09-08 18:43:02 +00:00
parent 4154738050
commit b501ea1b97
No known key found for this signature in database
1 changed files with 12 additions and 2 deletions

View File

@ -6,6 +6,11 @@ stages:
- build - build
test-build: test-build:
parallel:
matrix:
- VARIANT:
- c9s
- fedora
only: only:
- merge_requests - merge_requests
stage: build stage: build
@ -14,9 +19,14 @@ test-build:
- echo "$CI_REGISTRY_PASSWORD" | podman login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY - echo "$CI_REGISTRY_PASSWORD" | podman login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
script: script:
- rpm-ostree install distribution-gpg-keys - rpm-ostree install distribution-gpg-keys
- rpm-ostree compose image --initialize --format=ociarchive fedora.yaml fedora.ociarchive - rpm-ostree compose image --initialize --format=ociarchive ${VARIANT}.yaml ${VARIANT}.ociarchive
build-push: build-push:
parallel:
matrix:
- VARIANT:
- c9s
- fedora
rules: rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
variables: variables:
@ -28,5 +38,5 @@ build-push:
- echo "$CI_REGISTRY_PASSWORD" | podman login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY - echo "$CI_REGISTRY_PASSWORD" | podman login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
script: script:
- rpm-ostree install distribution-gpg-keys - rpm-ostree install distribution-gpg-keys
- rpm-ostree compose image ${COMPOSE_INITIALIZE:+--initialize} ${FORCE:+--force-nocache} --format=registry fedora.yaml ${CI_REGISTRY_IMAGE}/fedora - rpm-ostree compose image ${COMPOSE_INITIALIZE:+--initialize} ${FORCE:+--force-nocache} --format=registry ${VARIANT}.yaml ${CI_REGISTRY_IMAGE}/${VARIANT}-boot