diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index f7b3529b74..93536874e2 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -10,6 +10,7 @@ categories: - title: '🧰 Maintenance' labels: - 'chore' + - 'area/documentation' - 'area/ci' - 'area/tests' - 'dependencies' diff --git a/Makefile b/Makefile index f2c9d0eb13..883968feda 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ release-version: .PHONY: tag-release tag-release: - scripts/tag-release.sh + scripts/tag-release.sh $(CMD_ARGS) .PHONY: test test: binaries/client diff --git a/package.json b/package.json index 7a71c0dd8e..7a3141668f 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "OpenLens", "description": "OpenLens - Open Source IDE for Kubernetes", "homepage": "https://github.com/lensapp/lens", - "version": "5.0.0-beta.11", + "version": "5.0.0-beta.10", "main": "static/build/main.js", "copyright": "© 2021 OpenLens Authors", "license": "MIT", diff --git a/scripts/tag-release.sh b/scripts/tag-release.sh index 82b7f14e6c..ce2ddffb2b 100755 --- a/scripts/tag-release.sh +++ b/scripts/tag-release.sh @@ -1,10 +1,21 @@ #!/bin/bash +while [[ $# -gt 0 ]]; do + key="$1" + + case $key in + -f|--force) + FORCE="--force" + shift # past argument + ;; + esac +done + if [[ `git branch --show-current` =~ ^release/v ]] then VERSION_STRING=$(cat package.json | jq '.version' -r | xargs printf "v%s") - git tag ${VERSION_STRING} - git push ${GIT_REMOTE:-origin} ${VERSION_STRING} + git tag ${VERSION_STRING} ${FORCE} + git push ${GIT_REMOTE:-origin} ${VERSION_STRING} ${FORCE} else echo "You must be in a release branch" fi diff --git a/src/migrations/hotbar-store/5.0.0-beta.11.ts b/src/migrations/hotbar-store/5.0.0-beta.10.ts similarity index 99% rename from src/migrations/hotbar-store/5.0.0-beta.11.ts rename to src/migrations/hotbar-store/5.0.0-beta.10.ts index 9ad4feb0bf..fe1b06f320 100644 --- a/src/migrations/hotbar-store/5.0.0-beta.11.ts +++ b/src/migrations/hotbar-store/5.0.0-beta.10.ts @@ -35,7 +35,7 @@ interface Pre500WorkspaceStoreModel { } export default { - version: "5.0.0-beta.11", + version: "5.0.0-beta.10", run(store) { const hotbars: Hotbar[] = store.get("hotbars"); const userDataPath = app.getPath("userData"); diff --git a/src/migrations/hotbar-store/index.ts b/src/migrations/hotbar-store/index.ts index a18a27bcad..44c5ebcdf4 100644 --- a/src/migrations/hotbar-store/index.ts +++ b/src/migrations/hotbar-store/index.ts @@ -26,11 +26,11 @@ import { joinMigrations } from "../helpers"; import version500alpha0 from "./5.0.0-alpha.0"; import version500alpha2 from "./5.0.0-alpha.2"; import version500beta5 from "./5.0.0-beta.5"; -import version500beta11 from "./5.0.0-beta.11"; +import version500beta10 from "./5.0.0-beta.10"; export default joinMigrations( version500alpha0, version500alpha2, version500beta5, - version500beta11, + version500beta10, );