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-06-30 23:25:48 +0200
committerDavid Runge <dvzrv@archlinux.org>2021-07-01 15:08:17 +0200
commitd56cbd9537107bf176b20a7aa9fbf472a7035f45 (patch)
tree1f4f3f898a9af0a721bfdc4fb2d2c9bdcdfd8a27
parente0514b1d2e63ef50a4ca999dd402a1386e9ad77e (diff)
gitlab-ci: Include from ci-scripts
.gitlab-ci.yml: Include a gitlab CI yaml file from the ci-scripts repository, that replaces the build-host.sh script and abstracts the .build target. Move all variables to top-level as they are useful in all build targets. Remove unnecessary before_script definitions because they are abstracted away by ci-scripts.
-rw-r--r--.gitlab-ci.yml37
1 files changed, 12 insertions, 25 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3f77b7e..ed6aa92 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,43 +2,30 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
-default:
- image: "archlinux:latest"
+# NOTE: most functionality (apart from building) is abstracted by this include
+include:
+ - project: 'archlinux/ci-scripts'
+ ref: master
+ file: '/prepare_archiso_vm.yml'
variables:
BUILD_SCRIPT: ./.gitlab/ci/build_archiso.sh
+ PACKAGE_LIST: dosfstools e2fsprogs erofs-utils jq libisoburn mtools openssl qemu-headless squashfs-tools zsync
QEMU_BUILD_TIMEOUT: 2400
+ QEMU_COPY_ARTIFACTS_TIMEOUT: 120
QEMU_VM_MEMORY: 3072
ARCHISO_COW_SPACE_SIZE: 2g
stages:
- - lint
+ - check
- build
-shellcheck:
- stage: lint
+check:
before_script:
- pacman --noconfirm -Syu --needed make shellcheck
script:
- 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
- script:
- - ./.gitlab/ci/build-host.sh
- after_script:
- - PROFILE=($BUILD_SCRIPT_ARGS) && cp -- "output/${PROFILE[0]}/metrics.txt" .
- artifacts:
- name: "output"
- paths:
- - "output/*/*"
- expire_in: 2d
- reports:
- metrics: metrics.txt
+ stage: check
build_short:
extends: .build
@@ -49,11 +36,11 @@ build_short:
build_long:
extends: .build
- tags:
- - fast-single-thread
parallel:
matrix:
- BUILD_SCRIPT_ARGS: baseline iso
- BUILD_SCRIPT_ARGS: baseline netboot
- BUILD_SCRIPT_ARGS: releng iso
- BUILD_SCRIPT_ARGS: releng netboot
+ tags:
+ - fast-single-thread