diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 91abbfa..15587a1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,6 +16,11 @@ jobs: runs-on: ${{ matrix.platform }} steps: - uses: actions/checkout@v2 + - name: Install GNU tar + if: runner.os == 'macOS' + run: | + brew install gnu-tar + echo "::add-path::/usr/local/opt/gnu-tar/libexec/gnubin" - name: Get yarn cache directory path id: yarn-cache-dir-path run: echo "::set-output name=dir::$(yarn cache dir)" @@ -34,7 +39,7 @@ jobs: ~/.cargo/git ~/.cargo/bin desktop/src-tauri/target - key: ${{ matrix.platform }}-cargo-${{ hashFiles('**/Cargo.lock') }} + key: ${{ matrix.platform }}-cargo-v2-${{ hashFiles('**/Cargo.lock') }} restore-keys: | ${{ matrix.platform }}-cargo- - name: setup node @@ -59,10 +64,6 @@ jobs: sudo apt-get install -y webkit2gtk-4.0 squashfs-tools - name: install app dependencies run: yarn - - name: ensure cache is valid - if: runner.os != 'Windows' - run: cargo build --release || rm -rf desktop/src-tauri/target - working-directory: ./desktop/src-tauri - uses: tauri-apps/tauri-action@v0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d77703d..eb58450 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,6 +13,11 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Install GNU tar + if: runner.os == 'macOS' + run: | + brew install gnu-tar + echo "::add-path::/usr/local/opt/gnu-tar/libexec/gnubin" - name: setup node uses: actions/setup-node@v1 with: @@ -58,7 +63,7 @@ jobs: ~/.cargo/git ~/.cargo/bin desktop/src-tauri/target - key: ${{ matrix.platform }}-cargo-${{ hashFiles('**/Cargo.lock') }} + key: ${{ matrix.platform }}-cargo-v2-${{ hashFiles('**/Cargo.lock') }} restore-keys: | ${{ matrix.platform }}-cargo- - name: setup node @@ -83,10 +88,6 @@ jobs: sudo apt-get install -y webkit2gtk-4.0 squashfs-tools - name: install app dependencies run: yarn - - name: ensure cache is valid - if: runner.os != 'Windows' - run: cargo build --release || rm -rf desktop/src-tauri/target - working-directory: ./desktop/src-tauri - uses: tauri-apps/tauri-action@v0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}