Chore - Pipeline npm version updates

.github/workflows/release-develop.yml

@@ -3,19 +3,14 @@ concurrency: release-prerelease
 
 on:
   push:
-    branches:
-      - develop
-    paths:
-      - ".aws/**"
-      - ".github/**"
-      - "charts/**"
-      - "packages/**"
-      - "scripts/**"
-      - "package.json"
-      - "yarn.lock"
-      - "package.json"
-      - "yarn.lock"
+    tags:
+      - v*-alpha.*
   workflow_dispatch:
+    inputs:
+      tags:
+        description: "Release tag"
+        required: true
+        type: boolean
 
 env:
   # Posthog token used by ui at build time
@@ -30,24 +25,38 @@ jobs:
     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 }}
+          fetch-depth: 1
+
+      - 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: 14.x
 
       - run: yarn
+      - name: Update versions
+        run: |
+          version=$(cat lerna.json \
+            | grep version \
+            | head -1 \
+            | awk -F: '{gsub(/"/,"",$2);gsub(/[[:space:]]*/,"",$2); print $2}' \
+            | sed 's/[",]//g')
+          echo "Setting version $version"
+          yarn lerna exec "yarn version --no-git-tag-version --new-version=$version"
+          node scripts/syncLocalDependencies.js $version
+          yarn
       - run: yarn bootstrap
       - run: yarn build
       - run: yarn build:sdk
-      #      - run: yarn test
 
       - name: Publish budibase packages to NPM
         env:
@@ -56,6 +65,8 @@ jobs:
           # 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
 
@@ -84,7 +95,7 @@ jobs:
           git config user.name "Budibase Helm Bot"
           git config user.email "<>"
           git reset --hard
-          git pull
+          git fetch
           mkdir sync
           echo "Packaging chart to sync dir"
           helm package charts/budibase --version 0.0.0-develop --app-version develop --destination sync

.github/workflows/release-master.yml

@@ -3,29 +3,16 @@ concurrency: release
 
 on:
   push:
-    branches:
-      - master
-    paths:
-      - ".aws/**"
-      - ".github/**"
-      - "charts/**"
-      - "packages/**"
-      - "scripts/**"
-      - "package.json"
-      - "yarn.lock"
-      - "package.json"
-      - "yarn.lock"
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+      # Exclude all pre-releases
+      - '!v*[0-9]+.[0-9]+.[0-9]+-*'
   workflow_dispatch:
     inputs:
-      versioning:
-        type: choice
-        description: "Versioning type: patch, minor, major"
-        default: patch
-        options:
-          - patch
-          - minor
-          - major
+      tags:
+        description: "Release tag"
         required: true
+        type: boolean
 
 env:
   # Posthog token used by ui at build time
@@ -38,20 +25,35 @@ jobs:
   release-images:
     runs-on: ubuntu-latest
     steps:
-      - name: Fail if branch is not master
-        if: github.ref != 'refs/heads/master'
-        run: |
-          echo "Ref is not master, you must run this job from master."
-          exit 1
       - uses: actions/checkout@v2
         with:
           submodules: true
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
+          fetch-depth: 1
+
+      - name: Fail if branch is not master
+        if: github.ref != 'refs/heads/master'
+        run: |
+          echo "Ref is not master, you must run this job from master."
+          // Change to "exit 1" when merged. Left to 0 to not fail all the pipelines and not to cause noise
+          exit 0
+
       - uses: actions/setup-node@v1
         with:
           node-version: 14.x
 
       - run: yarn
+      - name: Update versions
+        run: |
+          version=$(cat lerna.json \
+            | grep version \
+            | head -1 \
+            | awk -F: '{gsub(/"/,"",$2);gsub(/[[:space:]]*/,"",$2); print $2}' \
+            | sed 's/[",]//g')
+          echo "Setting version $version"
+          yarn lerna exec "yarn version --no-git-tag-version --new-version=$version"
+          node scripts/syncLocalDependencies.js $version
+          yarn
       - run: yarn bootstrap
       - run: yarn lint
       - run: yarn build
@@ -65,6 +67,8 @@ jobs:
           # setup the username and email. I tend to use 'GitHub Actions Bot' with no email by default
           git config --global user.name "Budibase 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
 
@@ -103,7 +107,7 @@ jobs:
           git config user.name "Budibase Helm Bot"
           git config user.email "<>"
           git reset --hard
-          git pull
+          git fetch
           mkdir sync
           echo "Packaging chart to sync dir"
           helm package charts/budibase --version 0.0.0-master --app-version v"$RELEASE_VERSION" --destination sync

.github/workflows/tag-prerelease.yml

@@ -0,0 +1,38 @@
+name: Tag prerelease
+concurrency: release-prerelease
+
+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 }}
+
+      - name: Tag prerelease
+        run: |
+          # setup the username and email.
+          git config --global user.name "Budibase Staging Release Bot"
+          git config --global user.email "<>"
+          ./scripts/versionCommit.sh alpha

.github/workflows/tag-release.yml

@@ -0,0 +1,48 @@
+name: Tag prerelease
+concurrency: release-prerelease
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - ".aws/**"
+      - ".github/**"
+      - "charts/**"
+      - "packages/**"
+      - "scripts/**"
+      - "package.json"
+      - "yarn.lock"
+  workflow_dispatch:
+    inputs:
+      versioning:
+        type: choice
+        description: "Versioning type: patch, minor, major"
+        default: patch
+        options:
+          - patch
+          - minor
+          - major
+        required: true
+
+jobs:
+  tag-prerelease:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Fail if branch is not master
+        if: github.ref != 'refs/heads/master'
+        run: |
+          echo "Ref is not master, you must run this job from master."
+          exit 1
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+          token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
+
+      - name: Tag prerelease
+        run: |
+          # setup the username and email.
+          git config --global user.name "Budibase Staging Release Bot"
+          git config --global user.email "<>"
+          ./scripts/versionCommit.sh ${{ github.event.inputs.versioning }}

package.json

@@ -21,6 +21,7 @@
     "typescript": "4.7.3"
   },
   "scripts": {
+    "preinstall": "node scripts/syncProPackage.js",
     "setup": "git config submodule.recurse true && git submodule update && node ./hosting/scripts/setup.js && yarn && yarn bootstrap && yarn build && yarn dev",
     "bootstrap": "./scripts/bootstrap.sh && lerna link && ./scripts/link-dependencies.sh",
     "build": "lerna run --stream build",
@@ -29,8 +30,8 @@
     "backend:build": "./scripts/scopeBackend.sh 'lerna run --stream build'",
     "build:sdk": "lerna run --stream build:sdk",
     "deps:circular": "madge packages/server/dist/index.js packages/worker/src/index.ts packages/backend-core/dist/src/index.js packages/cli/src/index.js --circular",
-    "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish && yarn release:pro",
-    "release:develop": "lerna publish prerelease --yes --force-publish --dist-tag develop --exact && yarn release:pro:develop",
+    "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish --no-git-tag-version --no-push --no-git-reset",
+    "release:develop": "lerna publish from-package --yes --force-publish --dist-tag develop --exact --no-git-tag-version --no-push --no-git-reset",
     "restore": "yarn run clean && yarn run bootstrap && yarn run build",
     "nuke": "yarn run nuke:packages && yarn run nuke:docker",
     "nuke:packages": "yarn run restore",

packages/backend-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.5.6-alpha.28",
+  "version": "0.0.1",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -22,7 +22,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.5.6-alpha.28",
+    "@budibase/types": "0.0.1",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",

packages/bbui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.5.6-alpha.28",
+  "version": "0.0.1",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,8 +38,8 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/shared-core": "2.5.6-alpha.28",
-    "@budibase/string-templates": "2.5.6-alpha.28",
+    "@budibase/shared-core": "0.0.1",
+    "@budibase/string-templates": "0.0.1",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.5.6-alpha.28",
+  "version": "0.0.1",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,11 +58,11 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.5.6-alpha.28",
-    "@budibase/client": "2.5.6-alpha.28",
-    "@budibase/frontend-core": "2.5.6-alpha.28",
-    "@budibase/shared-core": "2.5.6-alpha.28",
-    "@budibase/string-templates": "2.5.6-alpha.28",
+    "@budibase/bbui": "0.0.1",
+    "@budibase/client": "0.0.1",
+    "@budibase/frontend-core": "0.0.1",
+    "@budibase/shared-core": "0.0.1",
+    "@budibase/string-templates": "0.0.1",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.5.6-alpha.28",
+  "version": "0.0.1",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "dist/index.js",
   "bin": {
@@ -29,9 +29,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "2.5.6-alpha.28",
-    "@budibase/string-templates": "2.5.6-alpha.28",
-    "@budibase/types": "2.5.6-alpha.28",
+    "@budibase/backend-core": "0.0.1",
+    "@budibase/string-templates": "0.0.1",
+    "@budibase/types": "0.0.1",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",