From 99223d25ce406e056232073d5ad9644653b85f5a Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 20 Jun 2023 12:51:57 +0100
Subject: [PATCH] "Fix" pipeline

---
 .github/workflows/budibase_ci.yml | 48 +++++++++++++++++--------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 6031703cfc..64bb41e973 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -1,5 +1,9 @@
 name: Budibase CI
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 on:
   # Trigger the workflow on push or pull request,
   # but only for the master branch
@@ -141,27 +145,27 @@ jobs:
         with:
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
 
-      - name: Check pro commit
-        id: get_pro_commits
-        run: |
-          cd submodule
-          pro_commit=$(git rev-parse HEAD)
-          latest_commit=$(git rev-parse origin/develop)
-          echo "pro_commit=$pro_commit" >> "$GITHUB_OUTPUT"
-          echo "latest_commit=$latest_commit" >> "$GITHUB_OUTPUT"
+      # - name: Check pro commit
+      #   id: get_pro_commits
+      #   run: |
+      #     cd submodule
+      #     pro_commit=$(git rev-parse HEAD)
+      #     latest_commit=$(git rev-parse origin/develop)
+      #     echo "pro_commit=$pro_commit" >> "$GITHUB_OUTPUT"
+      #     echo "latest_commit=$latest_commit" >> "$GITHUB_OUTPUT"
 
-      - name: Check submodule merged to develop
-        uses: actions/github-script@v4
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const submoduleCommit = '${{ steps.get_pro_commits.outputs.pro_commit }}';
-            const latestCommit = '${{ steps.get_pro_commits.outputs.latest_commit }}';
+      # - name: Check submodule merged to develop
+      #   uses: actions/github-script@v4
+      #   with:
+      #     github-token: ${{ secrets.GITHUB_TOKEN }}
+      #     script: |
+      #       const submoduleCommit = '${{ steps.get_pro_commits.outputs.pro_commit }}';
+      #       const latestCommit = '${{ steps.get_pro_commits.outputs.latest_commit }}';
 
-            if (submoduleCommit !== latestCommit) {
-              console.error('Submodule commit does not match the latest commit on the develop branch.');
-              console.error('Refer to the pro repo to merge your changes: https://github.com/Budibase/budibase-pro/blob/develop/docs/getting_started.md')
-              process.exit(1);
-            } else {
-              console.log('All good, the submodule had been merged and setup correctly!')
-            }
+      #       if (submoduleCommit !== latestCommit) {
+      #         console.error('Submodule commit does not match the latest commit on the develop branch.');
+      #         console.error('Refer to the pro repo to merge your changes: https://github.com/Budibase/budibase-pro/blob/develop/docs/getting_started.md')
+      #         process.exit(1);
+      #       } else {
+      #         console.log('All good, the submodule had been merged and setup correctly!')
+      #       }