From 692dcaa7468251b628840df8651eee9911e045a9 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 25 Jan 2024 09:15:37 +0100 Subject: [PATCH 1/8] Update github checkout action to v4 --- .github/workflows/budibase_ci.yml | 20 ++++++++++---------- .github/workflows/close-featurebranch.yml | 2 +- .github/workflows/deploy-featurebranch.yml | 2 +- .github/workflows/tag-release.yml | 4 ++-- packages/account-portal | 2 +- packages/pro | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index d6bbf19940..aa2fb08784 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -33,7 +33,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: ${{ env.IS_OSS_CONTRIBUTOR == 'false' }} token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }} @@ -50,7 +50,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: ${{ env.IS_OSS_CONTRIBUTOR == 'false' }} token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }} @@ -80,7 +80,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 @@ -92,7 +92,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: ${{ env.IS_OSS_CONTRIBUTOR == 'false' }} token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }} @@ -116,7 +116,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: ${{ env.IS_OSS_CONTRIBUTOR == 'false' }} token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }} @@ -140,7 +140,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: ${{ env.IS_OSS_CONTRIBUTOR == 'false' }} token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }} @@ -165,7 +165,7 @@ jobs: if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase' steps: - name: Checkout repo and submodules - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }} @@ -189,7 +189,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: ${{ env.IS_OSS_CONTRIBUTOR == 'false' }} token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }} @@ -219,7 +219,7 @@ jobs: if: inputs.run_as_oss != true && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase') steps: - name: Checkout repo and submodules - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }} @@ -269,7 +269,7 @@ jobs: if: inputs.run_as_oss != true && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase') steps: - name: Checkout repo and submodules - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }} diff --git a/.github/workflows/close-featurebranch.yml b/.github/workflows/close-featurebranch.yml index 5da3eb52cd..0439aec443 100644 --- a/.github/workflows/close-featurebranch.yml +++ b/.github/workflows/close-featurebranch.yml @@ -17,7 +17,7 @@ jobs: github.event.label.name == 'feature-branch' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: passeidireto/trigger-external-workflow-action@main env: PAYLOAD_BRANCH: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.BRANCH || github.head_ref }} diff --git a/.github/workflows/deploy-featurebranch.yml b/.github/workflows/deploy-featurebranch.yml index a5636fe912..eccc783dfb 100644 --- a/.github/workflows/deploy-featurebranch.yml +++ b/.github/workflows/deploy-featurebranch.yml @@ -17,7 +17,7 @@ jobs: contains(github.event.pull_request.labels.*.name, 'feature-branch') runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: passeidireto/trigger-external-workflow-action@main env: PAYLOAD_BRANCH: ${{ github.head_ref }} diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index 13d59d1019..483e895e98 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -28,7 +28,7 @@ jobs: run: | echo "Ref is not master, you must run this job from master." exit 1 - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: submodules: true token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} @@ -53,7 +53,7 @@ jobs: needs: [tag-release] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: peter-evans/repository-dispatch@v2 with: diff --git a/packages/account-portal b/packages/account-portal index 05c90ce551..00a8172bfd 160000 --- a/packages/account-portal +++ b/packages/account-portal @@ -1 +1 @@ -Subproject commit 05c90ce55144e260da6688335c16783eab79bf96 +Subproject commit 00a8172bfde1e2f446f0d90b30fa76f62ec83773 diff --git a/packages/pro b/packages/pro index ce7722ed44..a8a7cb8b11 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit ce7722ed4474718596b465dcfd49bef36cab2e42 +Subproject commit a8a7cb8b11f43ff56d232e80377debb03e107c6c From df3468d98d79830f1485246aa8890d5d57489efe Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 25 Jan 2024 09:17:17 +0100 Subject: [PATCH 2/8] Update actions/setup-node action to v4 --- .github/workflows/budibase_ci.yml | 14 +++++++------- packages/account-portal | 2 +- packages/pro | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index aa2fb08784..e1ed96428d 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -39,7 +39,7 @@ jobs: token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }} - name: Use Node.js 20.x - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20.x cache: yarn @@ -57,7 +57,7 @@ jobs: fetch-depth: 0 - name: Use Node.js 20.x - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20.x cache: yarn @@ -99,7 +99,7 @@ jobs: fetch-depth: 0 - name: Use Node.js 20.x - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20.x cache: yarn @@ -123,7 +123,7 @@ jobs: fetch-depth: 0 - name: Use Node.js 20.x - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20.x cache: yarn @@ -147,7 +147,7 @@ jobs: fetch-depth: 0 - name: Use Node.js 20.x - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20.x cache: yarn @@ -172,7 +172,7 @@ jobs: fetch-depth: 0 - name: Use Node.js 20.x - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20.x cache: yarn @@ -195,7 +195,7 @@ jobs: token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }} - name: Use Node.js 20.x - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20.x cache: yarn diff --git a/packages/account-portal b/packages/account-portal index 00a8172bfd..3f8331f0ec 160000 --- a/packages/account-portal +++ b/packages/account-portal @@ -1 +1 @@ -Subproject commit 00a8172bfde1e2f446f0d90b30fa76f62ec83773 +Subproject commit 3f8331f0ecb0730b982a9d6b108907c53c1534c3 diff --git a/packages/pro b/packages/pro index a8a7cb8b11..926d2d9cda 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit a8a7cb8b11f43ff56d232e80377debb03e107c6c +Subproject commit 926d2d9cdaf3e15ba62166dec37b6eb01c9cfc36 From 17c5a7a370331061bb904bb2d688eb2cacb750f5 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 25 Jan 2024 09:18:51 +0100 Subject: [PATCH 3/8] Update aws-actions/configure-aws-credentials to v4 --- packages/account-portal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/account-portal b/packages/account-portal index 3f8331f0ec..c0aba4bfd9 160000 --- a/packages/account-portal +++ b/packages/account-portal @@ -1 +1 @@ -Subproject commit 3f8331f0ecb0730b982a9d6b108907c53c1534c3 +Subproject commit c0aba4bfd96cc4b85257b42db04cd4314377606d From 015cbadb62612b9016136ddb2404aa7ab653f819 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 25 Jan 2024 09:20:03 +0100 Subject: [PATCH 4/8] Updating aws-actions/amazon-ecr-login to v2 --- packages/account-portal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/account-portal b/packages/account-portal index c0aba4bfd9..d17d902f26 160000 --- a/packages/account-portal +++ b/packages/account-portal @@ -1 +1 @@ -Subproject commit c0aba4bfd96cc4b85257b42db04cd4314377606d +Subproject commit d17d902f2669fdadac91138d0e5199da9027147c From 6033206fd3501a58aab8b96e25c5159a6fffe483 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 25 Jan 2024 09:52:31 +0100 Subject: [PATCH 5/8] Update pro ref --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 926d2d9cda..af39f63ba0 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 926d2d9cdaf3e15ba62166dec37b6eb01c9cfc36 +Subproject commit af39f63ba0f5d3fbc00152bbfb801294f7aa9983 From 8699ebdf5913c2a871edf8b5f223ceead804b68a Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 25 Jan 2024 09:55:28 +0100 Subject: [PATCH 6/8] Updating actions/github-script to v7 --- .github/workflows/budibase_ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index e1ed96428d..3060660d47 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -249,7 +249,7 @@ jobs: - name: Check submodule merged to base branch if: ${{ steps.get_pro_commits.outputs.base_commit != '' }} - uses: actions/github-script@v4 + uses: actions/github-script@v7 with: github-token: ${{ secrets.GITHUB_TOKEN }} script: | @@ -299,7 +299,7 @@ jobs: - name: Check submodule merged to base branch if: ${{ steps.get_accountportal_commits.outputs.base_commit != '' }} - uses: actions/github-script@v4 + uses: actions/github-script@v7 with: github-token: ${{ secrets.GITHUB_TOKEN }} script: | From 12bedc2ac21a7f8b81d56b3da3f216b5fe9762dd Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 25 Jan 2024 10:04:27 +0100 Subject: [PATCH 7/8] Update pro ref --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index af39f63ba0..08f23bb202 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit af39f63ba0f5d3fbc00152bbfb801294f7aa9983 +Subproject commit 08f23bb2021e451fab8b3a450d2bf1d4793e4d68 From a97a71f9adc5f562ed3e13aa5c55f2e081cf51f0 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 25 Jan 2024 15:17:57 +0100 Subject: [PATCH 8/8] Update refs --- packages/account-portal | 2 +- packages/pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/account-portal b/packages/account-portal index d17d902f26..1b9fa56fd7 160000 --- a/packages/account-portal +++ b/packages/account-portal @@ -1 +1 @@ -Subproject commit d17d902f2669fdadac91138d0e5199da9027147c +Subproject commit 1b9fa56fd7b0991b4963de9f3e8b4711abdcae71 diff --git a/packages/pro b/packages/pro index 08f23bb202..eb9565f568 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 08f23bb2021e451fab8b3a450d2bf1d4793e4d68 +Subproject commit eb9565f568cfef14b336b14eee753119acfdd43b