From 366d10740e657572b143928acbea53a678175f1c Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Mon, 3 Feb 2025 09:18:34 -0800
Subject: [PATCH 1/3] CI: use aarch64 gitlab runners for aarch64 build testing
Maybe a nicer way to work around the issue wrt qemu in CI[1], for aarch64 at least
1. https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/3275
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 09f57503849..004713f7054 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -157,7 +157,7 @@ build-x86:
build-aarch64:
extends: .build
- resource_group: qemu
+ tags: [arm64]
script:
- .ci/build-aarch64.sh
--
GitLab
From 5a702e5048b87878363d62b1af45415803c643b7 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Mon, 3 Feb 2025 10:14:12 -0800
Subject: [PATCH 2/3] CI: remove resource groups and retry build test jobs that
fail
resource groups are creating really long delays in CI
---
.gitlab-ci.yml | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 004713f7054..d906ab18ae9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -145,6 +145,13 @@ mr-settings:
- packages/
timeout: 10 h
+.build-retry:
+ extends: .build
+ retry:
+ max: 2
+ when:
+ - script_failure
+
build-x86_64:
extends: .build
script:
@@ -162,20 +169,17 @@ build-aarch64:
- .ci/build-aarch64.sh
build-armv7:
- extends: .build
- resource_group: qemu
+ extends: .build-retry
script:
- .ci/build-armv7.sh
build-armhf:
- extends: .build
- resource_group: qemu
+ extends: .build-retry
script:
- .ci/build-armhf.sh
build-riscv64:
- extends: .build
- resource_group: qemu
+ extends: .build-retry
script:
- .ci/build-riscv64.sh
--
GitLab
From 345b5d91c16ae3def680854aa67ecabc3e67a744 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Mon, 3 Feb 2025 09:19:52 -0800
Subject: [PATCH 3/3] DO NOT MERGE: main/hello-world: bumpity bump bump
---
main/hello-world/APKBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main/hello-world/APKBUILD b/main/hello-world/APKBUILD
index b6ece3889eb..78b46ee37a6 100644
--- a/main/hello-world/APKBUILD
+++ b/main/hello-world/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
pkgname=hello-world
pkgver=1
-pkgrel=6
+pkgrel=7
pkgdesc="hello world program to be built in the testsuite"
url="https://en.wikipedia.org/wiki/%22Hello,_World!%22_program"
arch="all"
--
GitLab