Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorDavid Runge <dvzrv@archlinux.org>2021-05-12 20:37:14 +0200
committerDavid Runge <dvzrv@archlinux.org>2021-05-13 18:32:22 +0200
commit9827cb19bbe83af9e673dcd6ba137eafba22af70 (patch)
treeaae0dbffdc60b5d1a8cf365c378296ff19f78409 /.gitlab-ci.yml
parentcde7296e6ae1eceec0fe0cfc32e37dbe390d1d35 (diff)
ci: Use environment variables to override build settings
.gitlab-ci.yml: Use environment variables to override the build settings offered by the build-host.sh script. Lower the RAM usage of the builds to 3072. Lower the COW space used by archiso to 2GiB. Remove dependency on libisoburn in the `before_script` section of the build target (libarchive and util-linux have replaced this requirement). Use size units in accordance with upstream documentation. Use the new name of the build's metrics file. Fixes #134
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml30
1 files changed, 15 insertions, 15 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c89dfc9..44fd2ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,6 +5,12 @@
default:
image: "archlinux:latest"
+variables:
+ BUILD_SCRIPT: ./.gitlab/ci/build-inside-vm.sh
+ QEMU_BUILD_TIMEOUT: 2400
+ QEMU_VM_MEMORY: 3072
+ ARCHISO_COW_SPACE_SIZE: 2g
+
stages:
- lint
- build
@@ -17,13 +23,15 @@ shellcheck:
- make lint
.build:
+ variables:
+ PACKAGE_LIST: dosfstools e2fsprogs erofs-utils jq libisoburn mtools openssl qemu-headless squashfs-tools zsync
stage: build
before_script:
- - pacman -Syu --needed --noconfirm qemu-headless libisoburn
+ - pacman -Syu --needed --noconfirm qemu-headless
script:
- ./.gitlab/ci/build-host.sh
after_script:
- - cp -- "output/${PROFILE}/job-metrics" metrics.txt
+ - PROFILE=($BUILD_SCRIPT_ARGS) && cp -- "output/${PROFILE[0]}/metrics.txt" .
artifacts:
name: "output"
paths:
@@ -38,12 +46,8 @@ build_short:
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_SCRIPT_ARGS: baseline bootstrap
+ - BUILD_SCRIPT_ARGS: releng bootstrap
build_long:
extends: .build
@@ -51,10 +55,6 @@ build_long:
- fast-single-thread
parallel:
matrix:
- - PROFILE: baseline
- BUILDMODE:
- - iso
- - PROFILE: releng
- BUILDMODE:
- - iso
- - netboot
+ - BUILD_SCRIPT_ARGS: baseline iso
+ - BUILD_SCRIPT_ARGS: releng iso
+ - BUILD_SCRIPT_ARGS: releng netboot