aboutsummaryrefslogtreecommitdiff
path: root/.github/workflows
diff options
context:
space:
mode:
authorclassabbyamp <void@placeviolette.net>2023-08-12 20:53:14 +0000
committerclassabbyamp <void@placeviolette.net>2023-08-18 20:37:04 +0000
commitc828e16253cce52c0028d19bd1834ce0a8de04bc (patch)
treea4b0d2fc6165e37d5c69668b9153a0c68ed56ba2 /.github/workflows
parent76c6e77f3514865439092d6ee0133fedb3e51ce0 (diff)
downloadvoid-packages-c828e16253cce52c0028d19bd1834ce0a8de04bc.tar
void-packages-c828e16253cce52c0028d19bd1834ce0a8de04bc.tar.gz
void-packages-c828e16253cce52c0028d19bd1834ce0a8de04bc.tar.bz2
void-packages-c828e16253cce52c0028d19bd1834ce0a8de04bc.tar.lz
void-packages-c828e16253cce52c0028d19bd1834ce0a8de04bc.tar.xz
void-packages-c828e16253cce52c0028d19bd1834ce0a8de04bc.tar.zst
void-packages-c828e16253cce52c0028d19bd1834ce0a8de04bc.zip
.github/workflows/{build,cycles}: use new buildroot images
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/build.yaml19
-rw-r--r--.github/workflows/cycles.yml2
2 files changed, 11 insertions, 10 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 65771241465..9b84be9ba13 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -40,11 +40,12 @@ jobs:
if: "!contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')"
container:
- image: 'ghcr.io/void-linux/xbps-src-masterdir:20230708RC01-${{ matrix.config.bootstrap }}'
+ image: ghcr.io/void-linux/void-buildroot-${{ matrix.config.libc }}:20230818R1
+ options: --platform ${{ matrix.config.platform }}
env:
PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
ARCH: '${{ matrix.config.arch }}'
- BOOTSTRAP: '${{ matrix.config.bootstrap }}'
+ BOOTSTRAP: '${{ matrix.config.host }}'
TEST: '${{ matrix.config.test }}'
HOSTREPO: /hostrepo
@@ -52,13 +53,13 @@ jobs:
fail-fast: false
matrix:
config:
- - { arch: x86_64, bootstrap: x86_64, test: 1 }
- - { arch: i686, bootstrap: i686, test: 1 }
- - { arch: aarch64, bootstrap: x86_64, test: 0 }
- - { arch: armv7l, bootstrap: x86_64, test: 0 }
- - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
- - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
- - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
+ - { arch: x86_64, host: x86_64, libc: glibc, platform: linux/amd64, test: 1 }
+ - { arch: i686, host: i686, libc: glibc, platform: linux/386, test: 1 }
+ - { arch: aarch64, host: x86_64, libc: glibc, platform: linux/amd64, test: 0 }
+ - { arch: armv7l, host: x86_64, libc: glibc, platform: linux/amd64, test: 0 }
+ - { arch: x86_64-musl, host: x86_64-musl, libc: musl, platform: linux/amd64, test: 1 }
+ - { arch: armv6l-musl, host: x86_64-musl, libc: musl, platform: linux/amd64, test: 0 }
+ - { arch: aarch64-musl, host: x86_64-musl, libc: musl, platform: linux/amd64, test: 0 }
steps:
- name: Prepare container
diff --git a/.github/workflows/cycles.yml b/.github/workflows/cycles.yml
index 394a4ffe51a..935daadec57 100644
--- a/.github/workflows/cycles.yml
+++ b/.github/workflows/cycles.yml
@@ -10,7 +10,7 @@ jobs:
permissions:
issues: write
container:
- image: 'ghcr.io/void-linux/xbps-src-masterdir:20230708RC01-x86_64-musl'
+ image: 'ghcr.io/void-linux/void-buildroot-musl:20230818R1'
env:
PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
steps: