From 5d590a35398dcbfc6d110369970f3baa20f9b53e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 17 Sep 2024 13:19:13 -0400
Subject: [PATCH] .github/workflows/build: only add chroot-git to path during
 prep steps

fixes #52250
---
 .github/workflows/build.yaml | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a77d1d4890bfaf..182941fec0aa8c 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 &&