From 43f5db648078e9cd4e18ca2559eae396858327d1 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Sat, 22 Aug 2020 09:19:32 +1000 Subject: [PATCH] try gnu tar workaround for CI cache https://github.com/actions/cache/issues/403#issuecomment-678348989 --- .github/workflows/checks.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index bd226889c..42980a1f5 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -142,6 +142,9 @@ jobs: # https://stackoverflow.com/questions/59644349/msgmerge-on-macos-catalina echo "::set-env name=PATH::/usr/local/opt/gettext/bin:$PATH" + # gnu tar for cache issue + echo "::add-path::/usr/local/opt/gnu-tar/libexec/gnubin" + - name: Configure Windows environment variables if: matrix.os == 'windows-latest' run: | @@ -176,6 +179,12 @@ jobs: run: | sudo chown -R $(whoami):$(id -ng) ~/.cargo/ + - name: Set up brew ripgrep, pyaudio, gettext, etc + if: matrix.os == 'macos-latest' + run: | + set -x + brew install portaudio protobuf gettext ripgrep make tar + # Disable it for macos because it pyenv cache is bugged (https://github.com/ankitects/anki/pull/563) - name: Cache pyenv if: matrix.os != 'macos-latest' && matrix.python == '3.7' @@ -257,12 +266,6 @@ jobs: curl --fail -LO https://github.com/BurntSushi/ripgrep/releases/download/11.0.2/ripgrep_11.0.2_amd64.deb sudo dpkg -i ripgrep_11.0.2_amd64.deb - - name: Set up brew ripgrep, pyaudio, gettext - if: matrix.os == 'macos-latest' - run: | - set -x - brew install portaudio protobuf gettext ripgrep make - - name: Set up python uses: actions/setup-python@v1 with: @@ -345,7 +348,3 @@ jobs: # https://github.com/ankitects/anki/pull/535 perl scripts/rename -f "s@\+[\w\d]+-@-@g" dist/* python -m twine upload --non-interactive --skip-existing --verbose dist/* - - - name: macOS CI workaround test - if: matrix.BUILD_TYPE == 'check' && matrix.os == 'macos-latest' - run: sync && sleep 10