Merge pull request #10801 from Budibase/master

Master

.github/workflows/deploy-cloud.yaml

@@ -2,29 +2,33 @@ name: Budibase Deploy Production
 
 on:
   workflow_dispatch:
+    inputs:
+      version:
+        description: Budibase release version. For example - 1.0.0
+        required: false
 
 jobs:
   release:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Fail if not a tag
-        run: |
-          if [[ $GITHUB_REF != refs/tags/* ]]; then 
-            echo "Workflow Dispatch can only be run on tags" 
-            exit 1 
-          fi
+      # - name: Fail if not a tag
+      #   run: |
+      #     if [[ $GITHUB_REF != refs/tags/* ]]; then
+      #       echo "Workflow Dispatch can only be run on tags"
+      #       exit 1
+      #     fi
 
       - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
+        # with:
+        #   fetch-depth: 0
 
-      - name: Fail if tag is not in master
-        run: |
-          if ! git merge-base --is-ancestor ${{ github.sha }} origin/master; then
-            echo "Tag is not in master. This pipeline can only execute tags that are present on the master branch"
-            exit 1
-          fi
+      # - name: Fail if tag is not in master
+      #   run: |
+      #     if ! git merge-base --is-ancestor ${{ github.sha }} origin/master; then
+      #       echo "Tag is not in master. This pipeline can only execute tags that are present on the master branch"
+      #       exit 1
+      #     fi
 
       - name: Pull values.yaml from budibase-infra
         run: |
@@ -37,7 +41,11 @@ jobs:
       - name: Get the latest budibase release version
         id: version
         run: |
+          if [ -z "${{ github.event.inputs.version }}" ]; then
             release_version=$(cat lerna.json | jq -r '.version')
+          else
+            release_version=${{ github.event.inputs.version }}
+          fi
           echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV
 
       - name: Configure AWS Credentials
@@ -66,4 +74,3 @@ jobs:
           webhook-url: ${{ secrets.PROD_DEPLOY_WEBHOOK_URL }}
           content: "Production Deployment Complete: ${{ env.RELEASE_VERSION }} deployed to Budibase Cloud."
           embed-title: ${{ env.RELEASE_VERSION }}
-

.github/workflows/release-selfhost.yml

@@ -17,7 +17,7 @@ jobs:
 
       - uses: actions/checkout@v2
         with:
-          fetch_depth: 0
+          fetch-depth: 0
 
       - name: Fail if tag is not in master
         run: |

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.6.28-alpha.0",
+  "version": "2.7.0",
   "npmClient": "yarn",
   "packages": [
     "packages/backend-core",