From c591c1fb6dfcb78e26bc0d30b292f3f96c5c3f48 Mon Sep 17 00:00:00 2001 From: ZanSara Date: Thu, 14 Dec 2023 11:21:53 +0100 Subject: [PATCH 1/2] Fix minor_version_release.yml to run on the v1.x branch --- .github/workflows/minor_version_release.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/minor_version_release.yml b/.github/workflows/minor_version_release.yml index e7752f867d..8bcfeb805f 100644 --- a/.github/workflows/minor_version_release.yml +++ b/.github/workflows/minor_version_release.yml @@ -1,4 +1,4 @@ -name: Minor Version Release +name: Minor Version Release (1.x) on: workflow_dispatch: @@ -12,6 +12,8 @@ jobs: steps: - name: Checkout this repo uses: actions/checkout@v4 + with: + ref: "v1.x" - name: Define all versions id: versions @@ -30,12 +32,12 @@ jobs: git checkout -b v${{ steps.versions.outputs.current_release_minor }}.x git push -u origin v${{ steps.versions.outputs.current_release_minor }}.x --tags - - name: Bump version on main + - name: Bump version on v1.x shell: bash env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - git checkout main + git checkout v1.x NEW_VERSION=$(awk -F. '/[0-9]+\./{$2++;print}' OFS=. < VERSION.txt) echo "$NEW_VERSION" > VERSION.txt cat VERSION.txt From 1664ad15e2ec346241d71d0889d4ec6e0c2ec058 Mon Sep 17 00:00:00 2001 From: ZanSara Date: Thu, 14 Dec 2023 11:33:11 +0100 Subject: [PATCH 2/2] review --- .github/workflows/minor_version_release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/minor_version_release.yml b/.github/workflows/minor_version_release.yml index 8bcfeb805f..5b174fa0d0 100644 --- a/.github/workflows/minor_version_release.yml +++ b/.github/workflows/minor_version_release.yml @@ -45,7 +45,7 @@ jobs: git commit -m "Update unstable version to $NEW_VERSION" VERSION_TAG="v$NEW_VERSION" git tag $VERSION_TAG -m"$VERSION_TAG" - git push --atomic origin main $VERSION_TAG + git push --atomic origin v1.x $VERSION_TAG - uses: actions/setup-python@v5 with: @@ -58,5 +58,5 @@ jobs: env: RDME_API_KEY: ${{ secrets.README_API_KEY }} run: | - git checkout main + git checkout v1.x python ./.github/utils/release_docs.py --new-version ${{ steps.versions.outputs.current_release_minor }}