From 365bf5bf966b43a40aa142e6a398626baa6c8e19 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 5 Jul 2023 10:31:11 +0200 Subject: [PATCH 1/3] Fetch depth to be able to read master --- .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 4ada96accc..2ebf9a93a3 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -175,6 +175,7 @@ jobs: uses: actions/checkout@v3 with: submodules: true + fetch-depth: 0 token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }} - name: Check pro commit From 72b1cda7d18b00901964574fc82b226736b05f45 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 5 Jul 2023 10:34:11 +0200 Subject: [PATCH 2/3] Fix commands --- .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 2ebf9a93a3..f2e7f2eda9 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -184,10 +184,10 @@ jobs: cd packages/pro pro_commit=$(git rev-parse HEAD) - branch=${{ github.base_ref || github.ref_name }} + branch="${{ github.base_ref || github.ref_name }}" echo "Running on branch `$branch` (base_ref=${{ github.base_ref }}, ref_name=${{ github.head_ref }})" - if [[ "$branch" == "master" ]]; then + if [[ $branch == "master" ]]; then base_commit=$(git rev-parse origin/master) else base_commit=$(git rev-parse origin/develop) From 35ce322a848ac83dc1de85310e68a7aa2842365d Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 5 Jul 2023 10:46:05 +0200 Subject: [PATCH 3/3] Update pro ref to latest master --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 544c7e067d..1a5207d91f 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 544c7e067de69832469cde673e59501480d6d98a +Subproject commit 1a5207d91fb9e0835562c708dd9c421973026543