Skip to content

Commit

Permalink
fix caching issue between windows and mac os (#706)
Browse files Browse the repository at this point in the history
* don't find rpc on windows

* fix cache issue

* temp commit

* fix test

* Revert "fix test"

This reverts commit 36fd866.

* Revert "don't find rpc on windows"

This reverts commit db7caca.

* Revert "temp commit"

This reverts commit 99c807c.
  • Loading branch information
pgrivachev authored Jan 27, 2023
1 parent 01b7c30 commit 3474da9
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,12 @@ jobs:
npm config set script-shell bash
npx vsce package -o ${FILE_NAME} --target ${{ matrix.target }} --githubBranch main
- name: fix cache issue on windows (use GNU tar instead BSD tar) # https://github.com/actions/toolkit/issues/552
if: matrix.os == 'windows-latest'
run: echo "C:/Program Files/Git/usr/bin/" >> $GITHUB_PATH

- name: create cache
uses: actions/cache@v3
with:
path: ./${{ env.FILE_NAME }}
key: ${{ env.FILE_NAME }}
enableCrossOsArchive: true

run-e2e-tests:
if: github.actor != 'dependabot[bot]'
Expand Down Expand Up @@ -148,16 +145,13 @@ jobs:
- name: checkout
uses: actions/checkout@v3

- name: fix cache issue on windows (use GNU tar instead BSD tar) # https://github.com/actions/toolkit/issues/552
if: matrix.os == 'windows-latest'
run: echo "C:/Program Files/Git/usr/bin/" >> $GITHUB_PATH

- name: load e2e tests and vsix from cache
uses: actions/cache@v3
id: cache
with:
path: ./${{ env.FILE_NAME }}
key: ${{ env.FILE_NAME }}
enableCrossOsArchive: true

- name: fail if cache not hit
if: steps.cache.outputs.cache-hit != 'true'
Expand Down Expand Up @@ -357,6 +351,7 @@ jobs:
with:
path: ./${{ env.VSIX_NAME }}
key: ${{ env.VSIX_NAME }}
enableCrossOsArchive: true
env:
VSIX_NAME: ${{ github.sha }}-darwin-x64.vsix

Expand All @@ -366,6 +361,7 @@ jobs:
with:
path: ./${{ env.VSIX_NAME }}
key: ${{ env.VSIX_NAME }}
enableCrossOsArchive: true
env:
VSIX_NAME: ${{ github.sha }}-darwin-arm64.vsix

Expand All @@ -375,6 +371,7 @@ jobs:
with:
path: ./${{ env.VSIX_NAME }}
key: ${{ env.VSIX_NAME }}
enableCrossOsArchive: true
env:
VSIX_NAME: ${{ github.sha }}-linux-x64.vsix

Expand All @@ -384,6 +381,7 @@ jobs:
with:
path: ./${{ env.VSIX_NAME }}
key: ${{ env.VSIX_NAME }}
enableCrossOsArchive: true
env:
VSIX_NAME: ${{ github.sha }}-linux-arm64.vsix

Expand All @@ -393,6 +391,7 @@ jobs:
with:
path: ./${{ env.VSIX_NAME }}
key: ${{ env.VSIX_NAME }}
enableCrossOsArchive: true
env:
VSIX_NAME: ${{ github.sha }}-win32-x64.vsix

Expand Down

0 comments on commit 3474da9

Please sign in to comment.