From 0799c5f277b3a3bbece1ee900dcc4372230bd454 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Sat, 16 Oct 2021 22:09:35 -0700
Subject: [PATCH] .github/workflows/tox.yml: Fixup for macOS tar

---
 .github/workflows/tox.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index c522ce605be..9e1f3ffe411 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -72,8 +72,9 @@ jobs:
           path: /tmp
         if: contains(matrix.stage, '2')
       - name: Extract sage-local artifact
+        # This is macOS tar -- cannot use --listed-incremental
         run: |
-          .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null $(pwd)/.tox/$TOX_ENV
+          .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar
         if: contains(matrix.stage, '2')
       - name: Build and test with tox
         # We use a high parallelization on purpose in order to catch possible parallelization bugs in the build scripts.
@@ -101,9 +102,10 @@ jobs:
       - name: Prepare sage-local artifact
         # This also includes the copies of homebrew or conda installed in the tox environment.
         # We use absolute pathnames in the tar file.
+        # This is macOS tar -- cannot use --remove-files.
         # We remove the $SAGE_LOCAL/lib64 link, which will be recreated by the next stage.
         run: |
-          (cd .tox/$TOX_ENV && rm -f "local/lib64" && tar -cf /tmp/sage-${{ env.TOX_ENV }}-${{ matrix.stage }}.tar --remove-files $(pwd))
+          (cd .tox/$TOX_ENV && rm -f "local/lib64" && tar -cf /tmp/sage-${{ env.TOX_ENV }}-${{ matrix.stage }}.tar $(pwd))
         if: contains(matrix.stage, '1')
       - uses: actions/upload-artifact@v2
         with: