Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Runge <dvzrv@archlinux.org>2021-05-10 22:57:20 +0200
committerDavid Runge <dvzrv@archlinux.org>2021-05-11 18:09:50 +0200
commitf86cb0faa22ba3ac65f549324a869eafa32a7b00 (patch)
tree6fddafc72910e94a6df369f9f7aa1d2df36f5407
parent5630a23ba16aa6159cc3a08251a6f7dc97e697da (diff)
ci: Expand parallel matrix with build modes
.gitlab-ci.yml: Expand the parallel matrix with build modes per profile. Do not run netboot with the baseline profile, as codesigning is not supported yet (#132). Remove tagging secure, as archiso builds will only ever be used for testing the project. Build ISOs using fast-single-thread (they take very long otherwise and hit the job time limit) and use any available runner for anything else.
-rw-r--r--.gitlab-ci.yml38
1 files changed, 22 insertions, 16 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 921bc07..c89dfc9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,9 +24,6 @@ shellcheck:
- ./.gitlab/ci/build-host.sh
after_script:
- cp -- "output/${PROFILE}/job-metrics" metrics.txt
- parallel:
- matrix:
- - PROFILE: [baseline, releng]
artifacts:
name: "output"
paths:
@@ -35,20 +32,29 @@ shellcheck:
reports:
metrics: metrics.txt
-build:
+build_short:
extends: .build
- tags:
- - fast-single-thread
- except:
- - master@archlinux/archiso
- - schedules@archlinux/archiso
- - tags@archlinux/archiso
+ parallel:
+ matrix:
+ # baseline does not support netboot with codesinging
+ # https://gitlab.archlinux.org/archlinux/archiso/-/issues/132
+ - PROFILE: baseline
+ BUILDMODE:
+ - bootstrap
+ - PROFILE: releng
+ BUILDMODE:
+ - bootstrap
-build:secure:
+build_long:
extends: .build
tags:
- - secure
- only:
- - master@archlinux/archiso
- - schedules@archlinux/archiso
- - tags@archlinux/archiso
+ - fast-single-thread
+ parallel:
+ matrix:
+ - PROFILE: baseline
+ BUILDMODE:
+ - iso
+ - PROFILE: releng
+ BUILDMODE:
+ - iso
+ - netboot