fixup! updpkgsums: include all required files in the sparse checkout

git-for-windows · Jun 7, 2024 · e0c712e · e0c712e
1 parent 70a37a8
commit e0c712e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/.github/actions/init-g4w-sdk-for-pacman/action.yml b/.github/actions/init-g4w-sdk-for-pacman/action.yml
@@ -1,5 +1,10 @@
 name: 'Initialize Git for Windows SDK subset to run `pacman`'
 description: 'This composite GitHub Action initializes a subset of the Git for Windows SDK intended to run `pacman` and friends'
+inputs:
+  include-pacman-conf:
+    description: 'Whether to include the Pacman configuration files'
+    required: false
+    default: 'false'
 outputs:
   result:
     description: 'The path to the subset of the SDK'
@@ -15,7 +20,7 @@ runs:
           https://github.com/git-for-windows/git-sdk-64 .tmp &&
         rev="$(git -C .tmp rev-parse HEAD)" &&
         echo "rev=$rev" >>$GITHUB_OUTPUT &&
-        echo "cache-key=g4w-sdk-$rev-2" >>$GITHUB_OUTPUT
+        echo "cache-key=g4w-sdk-$rev${{ inputs.include-pacman-conf != 'false' && '+conf' || '' }}" >>$GITHUB_OUTPUT
     - name: restore cached git-sdk-64 subset
       id: restore-g4w-sdk
       uses: actions/cache/restore@v4
@@ -40,8 +45,6 @@ runs:
         git show HEAD:.sparse/minimal-sdk >"$sparse" &&
         cat >>"$sparse" <<-EOF &&
         /etc/makepkg.conf
-        /etc/pacman.conf
-        /etc/pacman.d/
         /usr/bin/base64.exe
         /usr/bin/gettext.exe
         /usr/bin/makepkg
@@ -52,6 +55,14 @@ runs:
         /usr/share/makepkg/
         /mingw64/bin/curl.exe
         EOF
+        if test false != '${{ inputs.include-pacman-conf }}'
+        then
+          cat >>"$sparse" <<-EOF
+          /etc/pacman.conf
+          /etc/pacman.d/
+          /var/lib/pacman/
+          EOF
+        fi &&
         git checkout -- &&
 
         # makepkg/updpkgsums expects `curl` to be present in `/usr/bin/`

diff --git a/.github/workflows/updpkgsums.yml b/.github/workflows/updpkgsums.yml
@@ -51,6 +51,8 @@ jobs:
             core.setOutput('token', accessToken)
       - name: Initialize Git for Windows SDK subset
         uses: ./.github/actions/init-g4w-sdk-for-pacman
+        with:
+          include-pacman-conf: true
       - name: Clone ${{ env.REPO }}
         id: clone
         shell: bash