Skip to content

Commit 81de77d

Browse files
authored
Merge pull request #3024 from IntersectMBO/chore/update-actions-cache-workflow
chore: bump actions/cache to v4 across workflows
2 parents f144555 + 953d893 commit 81de77d

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

.github/workflows/code_check_frontend.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
uses: actions/checkout@v4
1919

2020
- name: Cache dependencies
21-
uses: actions/cache@v2
21+
uses: actions/cache@v4
2222
with:
2323
path: govtool/frontend/node_modules
2424
key: ${{ runner.os }}-node-${{ hashFiles('govtool/frontend/package-lock.json') }}
@@ -44,7 +44,7 @@ jobs:
4444
uses: actions/checkout@v4
4545

4646
- name: Cache dependencies
47-
uses: actions/cache@v2
47+
uses: actions/cache@v4
4848
with:
4949
path: govtool/frontend/node_modules
5050
key: ${{ runner.os }}-node-${{ hashFiles('govtool/frontend/package-lock.json') }}
@@ -70,7 +70,7 @@ jobs:
7070
uses: actions/checkout@v4
7171

7272
- name: Cache dependencies
73-
uses: actions/cache@v2
73+
uses: actions/cache@v4
7474
with:
7575
path: govtool/frontend/node_modules
7676
key: ${{ runner.os }}-node-${{ hashFiles('govtool/frontend/package-lock.json') }}

.github/workflows/frontend_sonar_scan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
1818

1919
- name: Cache dependencies
20-
uses: actions/cache@v2
20+
uses: actions/cache@v4
2121
with:
2222
path: govtool/frontend/node_modules
2323
key: ${{ runner.os }}-node-${{ hashFiles('govtool/frontend/package-lock.json') }}

.github/workflows/merge.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
uses: docker/setup-buildx-action@v2
103103

104104
- name: Cache Docker layers
105-
uses: actions/cache@v3
105+
uses: actions/cache@v4
106106
with:
107107
path: /tmp/.buildx-cache
108108
key: ${{ runner.os }}-buildx-${{ github.sha }}

.github/workflows/pr.yaml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ jobs:
7474
set -o pipefail
7575
sudo chmod +x lint.sh && ./lint.sh 2>&1 | tee code_lint_output.txt
7676
77-
7877
- name: Unit tests
7978
id: unit_tests
8079
run: |
@@ -90,7 +89,7 @@ jobs:
9089
uses: docker/setup-buildx-action@v2
9190

9291
- name: Cache Docker layers
93-
uses: actions/cache@v3
92+
uses: actions/cache@v4
9493
with:
9594
path: /tmp/.buildx-cache
9695
key: ${{ runner.os }}-buildx-${{ github.sha }}
@@ -127,19 +126,19 @@ jobs:
127126
VITE_IPFS_PROJECT_ID=${{ secrets.IPFS_PROJECT_ID }}
128127
IPFS_GATEWAY=${{ secrets.IPFS_GATEWAY }}
129128
IPFS_PROJECT_ID=${{ secrets.IPFS_PROJECT_ID }}
130-
129+
131130
- name: Scan Docker image with Dockle
132131
id: dockle
133132
run: |
134-
wget -q https://github.com/goodwithtech/dockle/releases/download/v0.4.14/dockle_0.4.14_Linux-64bit.tar.gz
135-
tar zxf dockle_0.4.14_Linux-64bit.tar.gz
136-
sudo mv dockle /usr/local/bin
133+
wget -q https://github.com/goodwithtech/dockle/releases/download/v0.4.14/dockle_0.4.14_Linux-64bit.tar.gz
134+
tar zxf dockle_0.4.14_Linux-64bit.tar.gz
135+
sudo mv dockle /usr/local/bin
137136
138-
dockle --exit-code 1 --exit-level fatal -ak GHC_RELEASE_KEY -ak CABAL_INSTALL_RELEASE_KEY -ak STACK_RELEASE_KEY -ak KEY_SHA512 --format json --input '/tmp/image-${{ matrix.name }}-${{ github.sha }}-pr.tar' --output ${{ matrix.workdir }}/dockle_scan_output.json
139-
rm -rf '/tmp/image-${{ matrix.name }}-${{ github.sha }}-pr.tar'
140-
cat ${{ matrix.workdir }}/dockle_scan_output.json
137+
dockle --exit-code 1 --exit-level fatal -ak GHC_RELEASE_KEY -ak CABAL_INSTALL_RELEASE_KEY -ak STACK_RELEASE_KEY -ak KEY_SHA512 --format json --input '/tmp/image-${{ matrix.name }}-${{ github.sha }}-pr.tar' --output ${{ matrix.workdir }}/dockle_scan_output.json
138+
rm -rf '/tmp/image-${{ matrix.name }}-${{ github.sha }}-pr.tar'
139+
cat ${{ matrix.workdir }}/dockle_scan_output.json
141140
142-
echo "outcome=success" >> $GITHUB_OUTPUT
141+
echo "outcome=success" >> $GITHUB_OUTPUT
143142
144143
- name: Create PR comment
145144
if: always()

.github/workflows/test_integration_playwright.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ on:
3131
workflow_run:
3232
workflows: ["Build and deploy GovTool test stack"]
3333
types: [completed]
34-
34+
3535
concurrency:
3636
group: ${{ github.workflow }}-${{ github.ref }}
3737
cancel-in-progress: false
3838

3939
jobs:
4040
integration-tests:
4141
runs-on: ubuntu-latest
42-
if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
42+
if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
4343
outputs:
4444
start_time: ${{ steps.set-pending-status.outputs.timestamp }}
4545
status: ${{ steps.run-test.outcome }}
@@ -49,7 +49,7 @@ jobs:
4949
steps:
5050
- uses: actions/checkout@v4
5151
with:
52-
ref: ${{ env.COMMIT_SHA }}
52+
ref: ${{ env.COMMIT_SHA }}
5353
- name: Set pending commit status
5454
id: set-pending-status
5555
run: |
@@ -70,7 +70,7 @@ jobs:
7070

7171
- name: Cache Playwright browsers
7272
id: cache-playwright-browsers
73-
uses: actions/cache@v3
73+
uses: actions/cache@v4
7474
with:
7575
path: |
7676
~/.cache/ms-playwright
@@ -132,7 +132,7 @@ jobs:
132132

133133
publish-report:
134134
runs-on: ubuntu-latest
135-
if: always() && needs.integration-tests.result != 'skipped'
135+
if: always() && needs.integration-tests.result != 'skipped'
136136
needs: integration-tests
137137
outputs:
138138
report_number: ${{ steps.report-details.outputs.report_number }}

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ changes.
3535
- Change threshold visual representation in governance action votes
3636
- Resize governance action details columns
3737
- Update @intersect.mbo/pdf-ui to v0.6.0
38+
- Bump actions/cache to v4 across workflows
3839

3940
### Removed
4041

0 commit comments

Comments
 (0)