From fc4b03d158539a845add9ed8de286eb1eab99c68 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Tue, 6 Jun 2023 07:42:33 +0100 Subject: [PATCH 1/4] Release master updates --- .github/workflows/release-master.yml | 1 + .github/workflows/tag-release.yml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml index f05d369a34..a6d6208d93 100644 --- a/.github/workflows/release-master.yml +++ b/.github/workflows/release-master.yml @@ -65,6 +65,7 @@ jobs: - name: Publish budibase packages to NPM env: NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + # TODO: What do we do here? 'versioning' is not defined RELEASE_VERSION_TYPE: ${{ github.event.inputs.versioning }} run: | # setup the username and email. I tend to use 'GitHub Actions Bot' with no email by default diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index 1dcb16ac56..01db27bcc3 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -28,7 +28,7 @@ on: required: true jobs: - tag-prerelease: + tag-release: runs-on: ubuntu-latest steps: @@ -43,7 +43,7 @@ jobs: token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} - run: yarn - - name: Tag prerelease + - name: Tag release run: | # setup the username and email. git config --global user.name "Budibase Staging Release Bot" From b79a6b82ba4f9103b1f2c89cb60d840fbf510c4e Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 6 Jun 2023 08:06:33 +0100 Subject: [PATCH 2/4] Publish release with the already fixed version --- .github/workflows/release-master.yml | 2 -- package.json | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml index a6d6208d93..97f823c11e 100644 --- a/.github/workflows/release-master.yml +++ b/.github/workflows/release-master.yml @@ -65,8 +65,6 @@ jobs: - name: Publish budibase packages to NPM env: NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - # TODO: What do we do here? 'versioning' is not defined - RELEASE_VERSION_TYPE: ${{ github.event.inputs.versioning }} run: | # 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" diff --git a/package.json b/package.json index 3849c65274..ffb3fa775a 100644 --- a/package.json +++ b/package.json @@ -38,8 +38,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 --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", + "release": "lerna publish from-package --yes --force-publish --no-git-tag-version --no-push --no-git-reset", + "release:develop": "yarn release --dist-tag develop", "restore": "yarn run clean && yarn run bootstrap && yarn run build", "nuke": "yarn run nuke:packages && yarn run nuke:docker", "nuke:packages": "yarn run restore", From 689d423e05301c53280755fd839e1795671d1c13 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 6 Jun 2023 08:11:30 +0100 Subject: [PATCH 3/4] Fix wrong message --- scripts/versionCommit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/versionCommit.sh b/scripts/versionCommit.sh index 10e7a9df71..d70f6900e2 100755 --- a/scripts/versionCommit.sh +++ b/scripts/versionCommit.sh @@ -2,7 +2,7 @@ if [ -z "$1" ] then - echo "Error: version number is required. Usage: $0 [major|minor|patch|prerelease]" + echo "Error: bump type is required. Usage: $0 [major|minor|patch|prerelease]" exit 1 fi From e7e28c0367b09a089b359012e29bab98e6f61462 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 6 Jun 2023 09:26:07 +0200 Subject: [PATCH 4/4] Defaulting release version to patch --- .github/workflows/tag-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index 01db27bcc3..40340ad2f1 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -48,4 +48,4 @@ jobs: # 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 }} + ./scripts/versionCommit.sh ${{ github.event.inputs.versioning:-patch }}