Merge branch 'master' into fix/12046-nav-links-overwrite-app

.github/workflows/budibase_ci.yml

@@ -10,7 +10,6 @@ on:
   push:
     branches:
       - master
-      - develop
   pull_request:
   workflow_dispatch:
 
@@ -262,11 +261,7 @@ jobs:
           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
+          base_commit=$(git rev-parse origin/master)
-            base_commit=$(git rev-parse origin/master)
-          elif [[ $branch == "develop" ]]; then
-            base_commit=$(git rev-parse origin/develop)
-          fi
 
           if [[ ! -z $base_commit ]]; then
             echo "target_branch=$branch"

.github/workflows/close-featurebranch.yml

@@ -4,7 +4,13 @@ on:
   pull_request:
     types: [closed]
     branches:
-      - develop
+      - master
+  workflow_dispatch:
+    inputs:
+      BRANCH:
+        type: string
+        description: Which featurebranch branch to destroy?
+        required: true
 
 jobs:
   release:
@@ -13,7 +19,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: passeidireto/trigger-external-workflow-action@main
         env:
-          PAYLOAD_BRANCH: ${{ github.head_ref }}
+          PAYLOAD_BRANCH: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.BRANCH || github.head_ref }}
           PAYLOAD_PR_NUMBER: ${{ github.ref }}
         with:
           repository: budibase/budibase-deploys

.github/workflows/deploy-featurebranch.yml

@@ -3,7 +3,6 @@ name: deploy-featurebranch
 on:
   pull_request:
     branches:
-      - develop
       - master
 
 jobs:

.github/workflows/deploy-preprod.yml

@@ -1,41 +0,0 @@
-name: "deploy-preprod"
-on:
-  workflow_dispatch:
-  workflow_call:
-
-jobs:
-  deploy-to-legacy-preprod-env:
-    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
-
-      - uses: actions/checkout@v2
-        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: Get the latest budibase release version
-        id: version
-        run: |
-          release_version=$(cat lerna.json | jq -r '.version')
-          echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV
-
-      - uses: passeidireto/trigger-external-workflow-action@main
-        env:
-          PAYLOAD_VERSION: ${{ env.RELEASE_VERSION }}
-        with:
-          repository: budibase/budibase-deploys
-          event: budicloud-preprod-deploy
-          github_pat: ${{ secrets.GH_ACCESS_TOKEN }}
-

.github/workflows/release-develop.yml

@@ -1,124 +0,0 @@
-name: Budibase Prerelease
-concurrency:
-  group: release-prerelease
-  cancel-in-progress: false
-
-on:
-  push:
-    tags:
-      - "*-alpha.*"
-  workflow_dispatch:
-
-env:
-  # Posthog token used by ui at build time
-  # disable unless needed for testing
-  # POSTHOG_TOKEN: phc_uDYOfnFt6wAbBAXkC6STjcrTpAFiWIhqgFcsC1UVO5F
-  INTERCOM_TOKEN: ${{ secrets.INTERCOM_TOKEN }}
-  PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
-  FEATURE_PREVIEW_URL: https://budirelease.live
-
-jobs:
-  release-images:
-    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
-
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-          token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
-          fetch-depth: 0
-
-      - name: Fail if tag is not develop
-        run: |
-          if ! git merge-base --is-ancestor ${{ github.sha }} origin/develop; then
-            echo "Tag is not in develop"
-            exit 1
-          fi
-
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 18.x
-
-      - run: yarn install --frozen-lockfile
-      - name: Update versions
-        run: ./scripts/updateVersions.sh
-      - run: yarn build
-      - run: yarn build:sdk
-
-      - name: Publish budibase packages to NPM
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-        run: |
-          # setup the username and email.
-          git config --global user.name "Budibase Staging Release Bot"
-          git config --global user.email "<>"
-          git submodule foreach git commit -a -m 'Release process'
-          git commit -a -m 'Release process'
-          echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc 
-          yarn release:develop
-
-      - name: Build/release Docker images
-        run: |
-          docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
-          yarn build:docker:develop
-        env:
-          DOCKER_USER: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}
-
-  release-helm-chart:
-    needs: [release-images]
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup Helm
-        uses: azure/setup-helm@v1
-        id: helm-install
-
-      # due to helm repo index issue: https://github.com/helm/helm/issues/7363
-      # we need to create new package in a different dir, merge the index and move the package back
-      - name: Build and release helm chart
-        run: |
-          git config user.name "Budibase Helm Bot"
-          git config user.email "<>"
-          git reset --hard
-          git fetch
-          mkdir sync
-          echo "Packaging chart to sync dir"
-          helm package charts/budibase --version 0.0.0-develop --app-version develop --destination sync
-          echo "Packaging successful"
-          git checkout gh-pages
-          echo "Indexing helm repo"         
-          helm repo index --merge docs/index.yaml sync
-          mv -f sync/* docs
-          rm -rf sync
-          echo "Pushing new helm release"
-          git add -A
-          git commit -m "Helm Release: develop"
-          git push
-
-  trigger-deploy-to-qa-env:
-    needs: [release-helm-chart]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Get the current budibase release version
-        id: version
-        run: |
-          release_version=$(cat lerna.json | jq -r '.version')
-          echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV
-
-      - uses: passeidireto/trigger-external-workflow-action@main
-        env:
-          PAYLOAD_VERSION: ${{ env.RELEASE_VERSION }}
-        with:
-          repository: budibase/budibase-deploys
-          event: budicloud-qa-deploy
-          github_pat: ${{ secrets.GH_ACCESS_TOKEN }}

.github/workflows/release-master.yml

@@ -110,19 +110,13 @@ jobs:
           git commit -m "Helm Release: ${{ env.RELEASE_VERSION }}"
           git push
 
-  deploy-to-legacy-preprod-env:
-    needs: [release-images]
-    uses: ./.github/workflows/deploy-preprod.yml
-    secrets: inherit
 
-  # Trigger deploy to new EKS preprod environment
+  trigger-deploy-to-qa-env:
-  trigger-deploy-to-preprod-env:
     needs: [release-helm-chart]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-
+      - name: Get the current budibase release version
-      - name: Get the latest budibase release version
         id: version
         run: |
           release_version=$(cat lerna.json | jq -r '.version')
@@ -133,5 +127,5 @@ jobs:
           PAYLOAD_VERSION: ${{ env.RELEASE_VERSION }}
         with:
           repository: budibase/budibase-deploys
-          event: budicloud-preprod-deploy
+          event: budicloud-qa-deploy
           github_pat: ${{ secrets.GH_ACCESS_TOKEN }}

.github/workflows/tag-prerelease.yml

@@ -1,42 +0,0 @@
-name: Tag prerelease
-concurrency:
-  group: tag-prerelease
-  cancel-in-progress: false
-
-on:
-  push:
-    branches:
-      - develop
-    paths:
-      - ".aws/**"
-      - ".github/**"
-      - "charts/**"
-      - "packages/**"
-      - "scripts/**"
-      - "package.json"
-      - "yarn.lock"
-  workflow_dispatch:
-
-jobs:
-  tag-prerelease:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Fail if branch is not develop
-        if: github.ref != 'refs/heads/develop'
-        run: |
-          echo "Ref is not develop, you must run this job from develop."
-          exit 1
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-          token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
-
-      - run: cd scripts && yarn
-      - name: Tag prerelease
-        run: |
-          cd scripts
-          # setup the username and email.
-          git config --global user.name "Budibase Staging Release Bot"
-          git config --global user.email "<>"
-          ./versionCommit.sh prerelease

.github/workflows/tag-release.yml

@@ -4,17 +4,6 @@ concurrency:
   cancel-in-progress: false
 
 on:
-  push:
-    branches:
-      - master
-    paths:
-      - ".aws/**"
-      - ".github/**"
-      - "charts/**"
-      - "packages/**"
-      - "scripts/**"
-      - "package.json"
-      - "yarn.lock"
   workflow_dispatch:
     inputs:
       versioning:

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.11.33",
+  "version": "2.11.34",
   "npmClient": "yarn",
   "packages": [
     "packages/*"