From f86cb0faa22ba3ac65f549324a869eafa32a7b00 Mon Sep 17 00:00:00 2001 From: David Runge Date: Mon, 10 May 2021 22:57:20 +0200 Subject: 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. --- .gitlab-ci.yml | 38 ++++++++++++++++++++++---------------- 1 file 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 -- cgit v1.2.3-70-g09d2