From 74cdc80024357970cedcdb851e120faab196ab0b Mon Sep 17 00:00:00 2001 From: Umberto Baldi <34278123+umbynos@users.noreply.github.com> Date: Thu, 19 Oct 2023 17:20:50 +0200 Subject: [PATCH] Introduce new "v" version format (#2374) we'll keep 0.35.x release branch name. We'll use "v" only for the tag, this way the documentation branches will work just like before, we are using "v" only for the github tag this way we are semver compliant --- .github/workflows/release-go-task.yml | 4 ++-- Taskfile.yml | 2 +- docs/UPGRADING.md | 2 +- install.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-go-task.yml b/.github/workflows/release-go-task.yml index fa40a11cb1e..e6f103de132 100644 --- a/.github/workflows/release-go-task.yml +++ b/.github/workflows/release-go-task.yml @@ -13,7 +13,7 @@ env: on: push: tags: - - "[0-9]+.[0-9]+.[0-9]+*" + - "v[0-9]+.[0-9]+.[0-9]+*" jobs: create-release-artifacts: @@ -45,7 +45,7 @@ jobs: if: matrix.os == 'Windows_32bit' uses: arduino/create-changelog@v1 with: - tag-regex: '^[0-9]+\.[0-9]+\.[0-9]+.*$' + tag-regex: '^v[0-9]+\.[0-9]+\.[0-9]+.*$' filter-regex: '^\[(skip|changelog)[ ,-](skip|changelog)\].*' case-insensitive-regex: true changelog-file-path: "${{ env.DIST_DIR }}/CHANGELOG.md" diff --git a/Taskfile.yml b/Taskfile.yml index 8d78b17b48d..e19fd011777 100755 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -363,7 +363,7 @@ vars: TIMESTAMP_SHORT: sh: echo "{{now | date "20060102"}}" TAG: - sh: echo "$(git tag --points-at=HEAD 2> /dev/null | head -n1)" + sh: echo "$(git tag --points-at=HEAD 2> /dev/null | head -n1 | sed 's/^v//')" VERSION: "{{if .NIGHTLY}}nightly-{{.TIMESTAMP_SHORT}}{{else if .TAG}}{{.TAG}}{{else}}{{.PACKAGE_NAME_PREFIX}}git-snapshot{{end}}" CONFIGURATION_PACKAGE: "github.com/arduino/arduino-cli/version" LDFLAGS: >- diff --git a/docs/UPGRADING.md b/docs/UPGRADING.md index 6b12115c0ff..537373e6d45 100644 --- a/docs/UPGRADING.md +++ b/docs/UPGRADING.md @@ -2,7 +2,7 @@ Here you can find a list of migration guides to handle breaking changes between releases of the CLI. -## 0.35.0 +## v0.35.0 ### CLI `debug --info` changed JSON output. diff --git a/install.sh b/install.sh index 1ef08729e69..d248dffdfb5 100755 --- a/install.sh +++ b/install.sh @@ -84,7 +84,7 @@ initDownloadTool() { checkLatestVersion() { # Use the GitHub releases webpage to find the latest version for this project # so we don't get rate-limited. - CHECKLATESTVERSION_REGEX="[0-9][A-Za-z0-9\.-]*" + CHECKLATESTVERSION_REGEX="v?[0-9][A-Za-z0-9\.-]*" CHECKLATESTVERSION_LATEST_URL="https://github.com/${PROJECT_OWNER}/${PROJECT_NAME}/releases/latest" if [ "$DOWNLOAD_TOOL" = "curl" ]; then CHECKLATESTVERSION_TAG=$(curl -SsL $CHECKLATESTVERSION_LATEST_URL | grep -o "Release $CHECKLATESTVERSION_REGEX ยท ${PROJECT_OWNER}/${PROJECT_NAME}" | grep -o "$CHECKLATESTVERSION_REGEX")