diff options
author | classabbyamp <void@placeviolette.net> | 2024-09-17 17:19:13 +0000 |
---|---|---|
committer | classabbyamp <5366828+classabbyamp@users.noreply.github.com> | 2024-09-17 17:34:32 +0000 |
commit | b14155fb2a5e3b3f20cd8a89a05c0706c619f0e9 (patch) | |
tree | 794f076e95c15666618f730ffa148642920522f8 /.github/workflows | |
parent | 5baa13c6189e805dde8241678cd453d4a4c5e954 (diff) | |
download | void-packages-b14155fb2a5e3b3f20cd8a89a05c0706c619f0e9.tar void-packages-b14155fb2a5e3b3f20cd8a89a05c0706c619f0e9.tar.gz void-packages-b14155fb2a5e3b3f20cd8a89a05c0706c619f0e9.tar.bz2 void-packages-b14155fb2a5e3b3f20cd8a89a05c0706c619f0e9.tar.lz void-packages-b14155fb2a5e3b3f20cd8a89a05c0706c619f0e9.tar.xz void-packages-b14155fb2a5e3b3f20cd8a89a05c0706c619f0e9.tar.zst void-packages-b14155fb2a5e3b3f20cd8a89a05c0706c619f0e9.zip |
.github/workflows/build: only add chroot-git to path during prep steps
fixes #52250
Diffstat (limited to '.github/workflows')
-rw-r--r-- | .github/workflows/build.yaml | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a77d1d4890b..182941fec0a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -42,10 +42,10 @@ jobs: uses: classabbyamp/treeless-checkout-action@v1 - name: Create hostrepo and prepare masterdir run: | - ln -s "$(pwd)" /hostrepo && - common/travis/set_mirror.sh && - common/travis/prepare.sh && - common/travis/fetch-xtools.sh + ln -s "$(pwd)" /hostrepo && + common/travis/set_mirror.sh && + common/travis/prepare.sh && + common/travis/fetch-xtools.sh - run: common/travis/changed_templates.sh - name: Run lints run: | @@ -64,7 +64,7 @@ jobs: image: ghcr.io/void-linux/void-buildroot-${{ matrix.config.libc }}:20240526R1 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' + PATH: '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin' ARCH: '${{ matrix.config.arch }}' BOOTSTRAP: '${{ matrix.config.host }}' TEST: '${{ matrix.config.test }}' @@ -94,14 +94,19 @@ jobs: xbps-install -yu - 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 - name: Create hostrepo and prepare masterdir run: | - ln -s "$(pwd)" /hostrepo && - common/travis/set_mirror.sh && - common/travis/prepare.sh && - common/travis/fetch-xtools.sh - - run: common/travis/changed_templates.sh + ln -s "$(pwd)" /hostrepo && + common/travis/set_mirror.sh && + common/travis/prepare.sh && + common/travis/fetch-xtools.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 run: | @@ -129,6 +134,8 @@ jobs: - name: Check file conflicts 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: | if [ -s /tmp/templates ]; then xlocate -S && |