From 5ff11595d7094bac50b38f56e02b9ddbbf89a836 Mon Sep 17 00:00:00 2001 From: Matiss Janis Aboltins Date: Fri, 2 Feb 2024 20:18:59 +0000 Subject: [PATCH 1/4] :wrench: upgrade deprecated github actions --- .github/actions/setup/action.yml | 4 ++-- .github/workflows/build.yml | 14 +++++++------- .github/workflows/check.yml | 10 +++++----- .github/workflows/codeql.yml | 6 +++--- .github/workflows/e2e-test.yml | 10 +++++----- .github/workflows/electron-master.yml | 4 ++-- .github/workflows/electron-pr.yml | 4 ++-- .github/workflows/issues-feature-implemented.yml | 4 ++-- .github/workflows/release-notes.yml | 2 +- 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index fbf55830d6a..78e0bd4c4fc 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -4,11 +4,11 @@ runs: using: composite steps: - name: Install node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 18.16.0 - name: Cache - uses: actions/cache@v3 + uses: actions/cache@v4 id: cache with: path: '**/node_modules' diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6636d56d741..ea0ba68a4e8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: api: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up environment uses: ./.github/actions/setup - name: Build API @@ -29,7 +29,7 @@ jobs: - name: Create package tgz run: cd packages/api && yarn pack && mv package.tgz actual-api.tgz - name: Upload Build - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: actual-api path: packages/api/actual-api.tgz @@ -37,7 +37,7 @@ jobs: crdt: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up environment uses: ./.github/actions/setup - name: Build CRDT @@ -45,7 +45,7 @@ jobs: - name: Create package tgz run: cd packages/crdt && yarn pack && mv package.tgz actual-crdt.tgz - name: Upload Build - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: actual-crdt path: packages/crdt/actual-crdt.tgz @@ -53,18 +53,18 @@ jobs: web: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up environment uses: ./.github/actions/setup - name: Build Web run: ./bin/package-browser - name: Upload Build - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: actual-web path: packages/desktop-client/build - name: Upload Build Stats - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: build-stats path: packages/desktop-client/build-stats diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index f10284c1d8e..d2cee1445af 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -14,7 +14,7 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up environment uses: ./.github/actions/setup - name: Lint @@ -22,7 +22,7 @@ jobs: typecheck: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up environment uses: ./.github/actions/setup - name: Typecheck @@ -30,7 +30,7 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up environment uses: ./.github/actions/setup - name: Test @@ -40,8 +40,8 @@ jobs: if: github.event_name == 'pull_request' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: '19' - name: Check migrations diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index efb3ea85c2e..20780a56257 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -22,14 +22,14 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: javascript - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 with: category: '/language:javascript' diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index c55cd17adf9..be9acef5837 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -16,7 +16,7 @@ jobs: outputs: netlify_url: ${{ steps.netlify.outputs.url }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up environment uses: ./.github/actions/setup - name: Wait for Netlify build to finish @@ -33,14 +33,14 @@ jobs: container: image: mcr.microsoft.com/playwright:v1.41.1-jammy steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up environment uses: ./.github/actions/setup - name: Run E2E Tests on Netlify URL run: yarn e2e env: E2E_START_URL: ${{ needs.netlify.outputs.netlify_url }} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: always() with: name: desktop-client-test-results @@ -53,14 +53,14 @@ jobs: container: image: mcr.microsoft.com/playwright:v1.41.1-jammy steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up environment uses: ./.github/actions/setup - name: Run VRT Tests on Netlify URL run: yarn vrt env: E2E_START_URL: ${{ needs.netlify.outputs.netlify_url }} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: always() with: name: desktop-client-test-results diff --git a/.github/workflows/electron-master.yml b/.github/workflows/electron-master.yml index 0fe0dd17025..fc0a57f3a6f 100644 --- a/.github/workflows/electron-master.yml +++ b/.github/workflows/electron-master.yml @@ -26,7 +26,7 @@ jobs: - macos-latest runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - if: ${{ startsWith(matrix.os, 'windows') }} run: pip.exe install setuptools - if: ${{ ! startsWith(matrix.os, 'windows') }} @@ -41,7 +41,7 @@ jobs: APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }} - name: Upload Build - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: actual-electron-${{ matrix.os }} path: | diff --git a/.github/workflows/electron-pr.yml b/.github/workflows/electron-pr.yml index 8a5f2a98682..58e1eda7c4f 100644 --- a/.github/workflows/electron-pr.yml +++ b/.github/workflows/electron-pr.yml @@ -24,7 +24,7 @@ jobs: - macos-latest runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - if: ${{ startsWith(matrix.os, 'windows') }} run: pip.exe install setuptools - if: ${{ ! startsWith(matrix.os, 'windows') }} @@ -34,7 +34,7 @@ jobs: - name: Build Electron run: ./bin/package-electron - name: Upload Build - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: actual-electron-${{ matrix.os }} path: | diff --git a/.github/workflows/issues-feature-implemented.yml b/.github/workflows/issues-feature-implemented.yml index 4c8bf1ea7f2..a7ab00ade48 100644 --- a/.github/workflows/issues-feature-implemented.yml +++ b/.github/workflows/issues-feature-implemented.yml @@ -24,8 +24,8 @@ jobs: runs-on: ubuntu-latest steps: # This is not a security concern because we have approved & merged the PR - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: '19' - name: Handle feature requests diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml index 4a5bd4c22c1..53d744265a8 100644 --- a/.github/workflows/release-notes.yml +++ b/.github/workflows/release-notes.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Check release notes if: startsWith(github.head_ref, 'release/') == false uses: actualbudget/actions/release-notes/check@main From 79ef841ebb4ee1eda040a40dc4d19bd099aca6c7 Mon Sep 17 00:00:00 2001 From: Matiss Janis Aboltins Date: Fri, 2 Feb 2024 20:19:53 +0000 Subject: [PATCH 2/4] Release notes --- upcoming-release-notes/2319.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 upcoming-release-notes/2319.md diff --git a/upcoming-release-notes/2319.md b/upcoming-release-notes/2319.md new file mode 100644 index 00000000000..1b33fc3848f --- /dev/null +++ b/upcoming-release-notes/2319.md @@ -0,0 +1,6 @@ +--- +category: Maintenance +authors: [MatissJanis] +--- + +Upgrade deprecated github CI actions From cd027acba0d689daea96d93a254f2f700772a318 Mon Sep 17 00:00:00 2001 From: Matiss Janis Aboltins Date: Fri, 2 Feb 2024 20:26:53 +0000 Subject: [PATCH 3/4] More upgrades --- .github/workflows/size-compare.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/size-compare.yml b/.github/workflows/size-compare.yml index 2db0cd588b7..eeec796c1a8 100644 --- a/.github/workflows/size-compare.yml +++ b/.github/workflows/size-compare.yml @@ -46,7 +46,7 @@ jobs: echo "Build failed on PR branch or ${{github.base_ref}}" exit 1 - name: Download build artifact from ${{github.base_ref}} - uses: dawidd6/action-download-artifact@v2 + uses: dawidd6/action-download-artifact@v3 id: pr-build with: branch: ${{github.base_ref}} @@ -55,7 +55,7 @@ jobs: path: base - name: Download build artifact from PR - uses: dawidd6/action-download-artifact@v2 + uses: dawidd6/action-download-artifact@v3 with: pr: ${{github.event.pull_request.number}} workflow: build.yml From 22f6252ec6c84636d393de935e388adebb939439 Mon Sep 17 00:00:00 2001 From: Matiss Janis Aboltins Date: Fri, 2 Feb 2024 20:32:29 +0000 Subject: [PATCH 4/4] Overwrite artefacts --- .github/workflows/e2e-test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index be9acef5837..9c5127795d0 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -46,6 +46,7 @@ jobs: name: desktop-client-test-results path: packages/desktop-client/test-results/ retention-days: 30 + overwrite: true vrt: name: Visual regression needs: netlify @@ -66,3 +67,4 @@ jobs: name: desktop-client-test-results path: packages/desktop-client/test-results/ retention-days: 30 + overwrite: true