.github/workflows/{build,cycles}: use new buildroot images

This commit is contained in:
classabbyamp 2023-08-12 16:53:14 -04:00
parent 76c6e77f35
commit c828e16253
No known key found for this signature in database
GPG Key ID: 6BE0755918A4C7F5
2 changed files with 11 additions and 10 deletions

View File

@ -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

View File

@ -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: