Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions .github/actions/install-dependencies-bun/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ outputs:
value: ${{ steps.bun-cache-dir.outputs.dir }}
download-cache-primary-key:
description: The cache key used for restoring the bun cache
value: ${{ steps.cache-restore-bun.outputs.cache-primary-key }}
value: ${{ steps.cache-keys.outputs.download-cache-primary-key }}
node-modules-primary-key:
description: The cache key used for restoring the node modules
value: ${{ steps.cache-restore-node-modules.outputs.cache-primary-key }}
value: ${{ steps.cache-keys.outputs.node-modules-primary-key }}
runs:
using: 'composite'
steps:
Expand All @@ -25,20 +25,25 @@ runs:
- run: echo "dir=$(bun pm cache)" >> $GITHUB_OUTPUT
shell: bash
id: bun-cache-dir
- run: |
echo "download-cache-primary-key=${{ runner.os }}-bun-${{ hashFiles('bun.lock') }}" >> $GITHUB_OUTPUT
echo "node-modules-primary-key=${{ runner.os }}-node_modules-${{ hashFiles('bun.lock') }}" >> $GITHUB_OUTPUT
shell: bash
id: cache-keys
- uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5
if: inputs.use-cache == 'true'
id: cache-restore-bun
with:
path: ${{ steps.bun-cache-dir.outputs.dir }}
key: ${{ runner.os }}-bun-${{ hashFiles('bun.lock') }}
key: ${{ steps.cache-keys.outputs.download-cache-primary-key }}
restore-keys: |
${{ runner.os }}-bun-
- uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5
if: inputs.use-cache == 'true'
id: cache-restore-node-modules
with:
path: node_modules
key: ${{ runner.os }}-node_modules-${{ hashFiles('bun.lock') }}
key: ${{ steps.cache-keys.outputs.node-modules-primary-key }}
restore-keys: |
${{ runner.os }}-node_modules-
- run: bun install --frozen-lockfile
Expand Down
13 changes: 9 additions & 4 deletions .github/actions/install-dependencies/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ outputs:
value: ${{ steps.yarn-cache-dir.outputs.dir }}
download-cache-primary-key:
description: The cache key used for restoring the yarn cache
value: ${{ steps.cache-restore-yarn.outputs.cache-primary-key }}
value: ${{ steps.cache-keys.outputs.download-cache-primary-key }}
node-modules-primary-key:
description: The cache key used for restoring the node modules
value: ${{ steps.cache-restore-node-modules.outputs.cache-primary-key }}
value: ${{ steps.cache-keys.outputs.node-modules-primary-key }}
runs:
using: 'composite'
steps:
Expand All @@ -25,20 +25,25 @@ runs:
- run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
shell: bash
id: yarn-cache-dir
- run: |
echo "download-cache-primary-key=${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}" >> $GITHUB_OUTPUT
echo "node-modules-primary-key=${{ runner.os }}-node_modules-${{ hashFiles('yarn.lock') }}" >> $GITHUB_OUTPUT
shell: bash
id: cache-keys
- uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5
if: inputs.use-cache == 'true'
id: cache-restore-yarn
with:
path: ${{ steps.yarn-cache-dir.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
key: ${{ steps.cache-keys.outputs.download-cache-primary-key }}
restore-keys: |
${{ runner.os }}-yarn-
- uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5
if: inputs.use-cache == 'true'
id: cache-restore-node-modules
with:
path: node_modules
key: ${{ runner.os }}-node_modules-${{ hashFiles('yarn.lock') }}
key: ${{ steps.cache-keys.outputs.node-modules-primary-key }}
restore-keys: |
${{ runner.os }}-node_modules-
- run: yarn install --frozen-lockfile
Expand Down