Linux build: need a sudo for chown

[ci skip]
r-lib · Aug 27, 2023 · 336d1b5 · 336d1b5
1 parent 8b0b934
commit 336d1b5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -111,13 +111,13 @@ jobs:
 
     - name: Uncompress rig build
       run: |
-        ls -R
         mkdir build
         tar xzf rig-*.tar.gz -C build
+        find build
 
     - name: Test
       run: |
-        make test-linux-${{ matrix.container }}
+        make linux-test-${{ matrix.container }}
 
   linux-build-aarch64:
     if: ${{ github.event.inputs.inplinuxaarch64 == '' || github.event.inputs.inplinuxaarch64 == 'yes' }}
@@ -181,13 +181,13 @@ jobs:
 
     - name: Uncompress rig build
       run: |
-        ls -R
         mkdir build
         tar xzf rig-*.tar.gz -C build
+        find build
 
     - name: Test
       run: |
-        make test-linux-${{ matrix.container }}
+        make linux-test-${{ matrix.container }}
 
   macos:
     if: ${{ github.event.inputs.inpmacos == '' || github.event.inputs.inpmacos == 'yes' }}

diff --git a/Makefile b/Makefile
@@ -69,8 +69,7 @@ print-linux-variants-json:
 linux-in-docker:
 	docker compose build
 	docker run -v .:/work rlib/rig-builder:latest make linux
-	chown -R `id -u`:`id -g` build
-	find . -name "rig-$(VERSION)-.tar.gz" | xargs chown -R `id -u`:`id -g`
+	sudo chown -R `id -u`:`id -g` build *.tar.gz || true
 
 define GEN_TESTS
 linux-test-$(variant):