Skip to content

Commit 9012ddf

Browse files
authored
refactor: use separate cache key in release, run standalone after caching (#5859)
* refactor: remove keytar dep in cross-compile * refactor: try other keytar package * refactor: remove keytar step in cross-compile * fix: manually remove keytar * try this first * I think this is it * Revert "I think this is it" This reverts commit 5c566b0. * okay this is it * fixup * try legacy peer * remove keytar before standalone * wrong path * maybe * revert: change *npm* back to npm* * revert: don't uninstall keytar * fix: use npm run standalone-release * fixup formatting * Revert "refactor: remove yarn.lock steps (#5850)" This reverts commit 907747d. * fixup: remove the --exclude * refactor: remove yarn.lock check * try ddd in postinstall * refactor: cache before release:standalone * refactor: add os to cache key in release * chore: formatting * Update ci/build/npm-postinstall.sh * fixup: formatting
1 parent 1efc5f1 commit 9012ddf

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

.github/workflows/release.yaml

+12-12
Original file line numberDiff line numberDiff line change
@@ -67,19 +67,19 @@ jobs:
6767
- name: Decompress npm package
6868
run: tar -xzf package.tar.gz
6969

70-
# NOTE: && here is deliberate - GitHub puts each line in its own `.sh`
71-
# file when running inside a docker container.
72-
- name: Build standalone release
73-
run: source scl_source enable devtoolset-9 && npm run release:standalone
74-
7570
- name: Fetch dependencies from cache
7671
id: cache-node-modules
7772
uses: actions/cache@v3
7873
with:
7974
path: "**/node_modules"
80-
key: yarn-build-${{ hashFiles('**/yarn.lock') }}
75+
key: yarn-build-linux-amd64-${{ hashFiles('**/yarn.lock') }}
8176
restore-keys: |
82-
yarn-build-
77+
yarn-build-linux-amd64-
78+
79+
# NOTE: && here is deliberate - GitHub puts each line in its own `.sh`
80+
# file when running inside a docker container.
81+
- name: Build standalone release
82+
run: source scl_source enable devtoolset-9 && npm run release:standalone
8383

8484
- name: Install test dependencies
8585
if: steps.cache-node-modules.outputs.cache-hit != 'true'
@@ -237,17 +237,17 @@ jobs:
237237
- name: Decompress npm package
238238
run: tar -xzf package.tar.gz
239239

240-
- name: Build standalone release
241-
run: npm run release:standalone
242-
243240
- name: Fetch dependencies from cache
244241
id: cache-node-modules
245242
uses: actions/cache@v3
246243
with:
247244
path: "**/node_modules"
248-
key: yarn-build-${{ hashFiles('**/yarn.lock') }}
245+
key: yarn-build-macos-${{ hashFiles('**/yarn.lock') }}
249246
restore-keys: |
250-
yarn-build-
247+
yarn-build-macos-
248+
249+
- name: Build standalone release
250+
run: npm run release:standalone
251251

252252
- name: Install test dependencies
253253
if: steps.cache-node-modules.outputs.cache-hit != 'true'

0 commit comments

Comments
 (0)