From 5939a3f4f1bf65d6f11438db039f0ea33e8dda63 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 27 Mar 2024 12:15:30 +0100 Subject: [PATCH 1/8] Ignore merge conflicts on pro submodule checks --- .github/workflows/budibase_ci.yml | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index 5a0d09033a..62db7e3826 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -231,27 +231,28 @@ jobs: echo "pro_commit=$pro_commit" echo "pro_commit=$pro_commit" >> "$GITHUB_OUTPUT" echo "base_commit=$base_commit" - echo "base_commit=$base_commit" >> "$GITHUB_OUTPUT" + + base_commit_excluding_merges=$(git log --no-merges -n 1 --format=format:%H $base_commit) + echo "base_commit_excluding_merges=$base_commit_excluding_merges" + echo "base_commit_excluding_merges=$base_commit_excluding_merges" >> "$GITHUB_OUTPUT" else echo "Nothing to do - branch to branch merge." fi - name: Check submodule merged to base branch - if: ${{ steps.get_pro_commits.outputs.base_commit != '' }} - uses: actions/github-script@v7 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - script: | - const submoduleCommit = '${{ steps.get_pro_commits.outputs.pro_commit }}'; - const baseCommit = '${{ steps.get_pro_commits.outputs.base_commit }}'; + if: ${{ steps.get_pro_commits.outputs.base_commit_excluding_merges != '' }} + run: | + base_commit_excluding_merges=${{ steps.get_pro_commits.outputs.base_commit_excluding_merges }}' + any_commit=$(git log origin/master...$base_commit_excluding_merges) + if [ -n "$any_commit" ]; then + echo "An error occurred: " + echo 'Submodule commit does not match the latest commit on the "${{ steps.get_pro_commits.outputs.target_branch }}" branch.' + echo 'Refer to the pro repo to merge your changes: https://github.com/Budibase/budibase-pro/blob/master/docs/getting_started.md' - if (submoduleCommit !== baseCommit) { - console.error('Submodule commit does not match the latest commit on the "${{ steps.get_pro_commits.outputs.target_branch }}" branch.'); - console.error('Refer to the pro repo to merge your changes: https://github.com/Budibase/budibase-pro/blob/master/docs/getting_started.md') - process.exit(1); - } else { - console.log('All good, the submodule had been merged and setup correctly!') - } + exit 1 + else + echo 'All good, the submodule had been merged and setup correctly!' + fi check-accountportal-submodule: runs-on: ubuntu-latest From 02e2d26985c272b9f6fe30c8edb18a9d5a4ec751 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 27 Mar 2024 12:20:07 +0100 Subject: [PATCH 2/8] Fix --- .github/workflows/budibase_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index 62db7e3826..9164e9974f 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -242,7 +242,7 @@ jobs: - name: Check submodule merged to base branch if: ${{ steps.get_pro_commits.outputs.base_commit_excluding_merges != '' }} run: | - base_commit_excluding_merges=${{ steps.get_pro_commits.outputs.base_commit_excluding_merges }}' + base_commit_excluding_merges='${{ steps.get_pro_commits.outputs.base_commit_excluding_merges }}' any_commit=$(git log origin/master...$base_commit_excluding_merges) if [ -n "$any_commit" ]; then echo "An error occurred: " From 4fb62177305048b2652f9b398f63f82aa56d219f Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 27 Mar 2024 12:24:16 +0100 Subject: [PATCH 3/8] Fix checks --- .github/workflows/budibase_ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index 9164e9974f..ade611a08c 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -243,8 +243,13 @@ jobs: if: ${{ steps.get_pro_commits.outputs.base_commit_excluding_merges != '' }} run: | base_commit_excluding_merges='${{ steps.get_pro_commits.outputs.base_commit_excluding_merges }}' - any_commit=$(git log origin/master...$base_commit_excluding_merges) + pro_commit='${{ steps.get_pro_commits.outputs.pro_commit }}' + + any_commit=$(git log $base_commit_excluding_merges...$pro_commit) + if [ -n "$any_commit" ]; then + echo $any_commit + echo "An error occurred: " echo 'Submodule commit does not match the latest commit on the "${{ steps.get_pro_commits.outputs.target_branch }}" branch.' echo 'Refer to the pro repo to merge your changes: https://github.com/Budibase/budibase-pro/blob/master/docs/getting_started.md' From c255c70954346d8e35b87c678ffaaac859582038 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 27 Mar 2024 12:25:37 +0100 Subject: [PATCH 4/8] cd --- .github/workflows/budibase_ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index ade611a08c..4c1110fb08 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -242,6 +242,7 @@ jobs: - name: Check submodule merged to base branch if: ${{ steps.get_pro_commits.outputs.base_commit_excluding_merges != '' }} run: | + cd packages/pro base_commit_excluding_merges='${{ steps.get_pro_commits.outputs.base_commit_excluding_merges }}' pro_commit='${{ steps.get_pro_commits.outputs.pro_commit }}' From 89d9b787df98ba521d37758d33015902b3a47143 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 27 Mar 2024 12:26:10 +0100 Subject: [PATCH 5/8] Rename --- .github/workflows/budibase_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index 4c1110fb08..aef88a30d6 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -239,7 +239,7 @@ jobs: echo "Nothing to do - branch to branch merge." fi - - name: Check submodule merged to base branch + - name: Check submodule merged and latest on base branch if: ${{ steps.get_pro_commits.outputs.base_commit_excluding_merges != '' }} run: | cd packages/pro From 1ed687f6c483728c245afa8232da399be81d5b56 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 27 Mar 2024 12:37:07 +0100 Subject: [PATCH 6/8] Fix checks --- .github/workflows/budibase_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index aef88a30d6..b8bd6063ef 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -246,7 +246,7 @@ jobs: base_commit_excluding_merges='${{ steps.get_pro_commits.outputs.base_commit_excluding_merges }}' pro_commit='${{ steps.get_pro_commits.outputs.pro_commit }}' - any_commit=$(git log $base_commit_excluding_merges...$pro_commit) + any_commit=$(git log --no-merges $base_commit_excluding_merges...$pro_commit) if [ -n "$any_commit" ]; then echo $any_commit From 4493905e74302ac4116b2e6c2858b722482c4323 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 27 Mar 2024 12:39:20 +0100 Subject: [PATCH 7/8] Update submodule --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index f8e8f87bd5..8a10ac52a4 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit f8e8f87bd52081e1303a5ae92c432ea5b38f3bb4 +Subproject commit 8a10ac52a4fdb6eb1f444aa0a308fd28ede526ec From ab46a3e5e8e9b20d956b56ac539b0a6c2301f3c0 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 27 Mar 2024 12:41:05 +0100 Subject: [PATCH 8/8] Update submodule --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 8a10ac52a4..6b62505be0 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 8a10ac52a4fdb6eb1f444aa0a308fd28ede526ec +Subproject commit 6b62505be0c0b50a57b4f4980d86541ebdc86428