moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

.github/workflows/build: only add chroot-git to path during prep steps

Browse source 
fixes #52250
This commit is contained in:
classabbyamp 2024-09-17 13:19:13 -04:00 • committed by classabbyamp
parent 5baa13c618
commit b14155fb2a
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
.github/workflows/build.yaml vendored
View file

@ -42,10 +42,10 @@ jobs:
uses: classabbyamp/treeless-checkout-action@v1 uses: classabbyamp/treeless-checkout-action@v1
- name: Create hostrepo and prepare masterdir - name: Create hostrepo and prepare masterdir
run: | run: |
ln -s "$(pwd)" /hostrepo && ln -s "$(pwd)" /hostrepo &&
common/travis/set_mirror.sh && common/travis/set_mirror.sh &&
common/travis/prepare.sh && common/travis/prepare.sh &&
common/travis/fetch-xtools.sh common/travis/fetch-xtools.sh
- run: common/travis/changed_templates.sh - run: common/travis/changed_templates.sh
- name: Run lints - name: Run lints
run: | run: |
@ -64,7 +64,7 @@ jobs:
image: ghcr.io/void-linux/void-buildroot-${{ matrix.config.libc }}:20240526R1 image: ghcr.io/void-linux/void-buildroot-${{ matrix.config.libc }}:20240526R1
options: --platform ${{ matrix.config.platform }} options: --platform ${{ matrix.config.platform }}
env: env:
PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin' PATH: '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
ARCH: '${{ matrix.config.arch }}' ARCH: '${{ matrix.config.arch }}'
BOOTSTRAP: '${{ matrix.config.host }}' BOOTSTRAP: '${{ matrix.config.host }}'
TEST: '${{ matrix.config.test }}' TEST: '${{ matrix.config.test }}'
@ -94,14 +94,19 @@ jobs:
xbps-install -yu xbps-install -yu
- name: Clone and checkout - name: Clone and checkout
env:
PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
uses: classabbyamp/treeless-checkout-action@v1 uses: classabbyamp/treeless-checkout-action@v1
- name: Create hostrepo and prepare masterdir - name: Create hostrepo and prepare masterdir
run: | run: |
ln -s "$(pwd)" /hostrepo && ln -s "$(pwd)" /hostrepo &&
common/travis/set_mirror.sh && common/travis/set_mirror.sh &&
common/travis/prepare.sh && common/travis/prepare.sh &&
common/travis/fetch-xtools.sh common/travis/fetch-xtools.sh
- run: common/travis/changed_templates.sh - name: Find changed templates
env:
PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
run: common/travis/changed_templates.sh
- name: Build and check packages - name: Build and check packages
run: | run: |
@ -129,6 +134,8 @@ jobs:
- name: Check file conflicts - name: Check file conflicts
if: matrix.config.arch == 'x86_64' # the arch indexed in xlocate if: matrix.config.arch == 'x86_64' # the arch indexed in xlocate
env:
PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
run: | run: |
if [ -s /tmp/templates ]; then if [ -s /tmp/templates ]; then
xlocate -S && xlocate -S &&