From acba811966555f5c266d352c24fec5c9aac00693 Mon Sep 17 00:00:00 2001 From: umberto di fabrizio Date: Fri, 28 Feb 2025 13:29:13 +0000 Subject: [PATCH 1/3] quick clean --- .github/workflows/version_bump.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/version_bump.yml b/.github/workflows/version_bump.yml index 7c35e52f6..d74431e8c 100644 --- a/.github/workflows/version_bump.yml +++ b/.github/workflows/version_bump.yml @@ -120,11 +120,11 @@ jobs: - name: Create pull request to master if: ${{ env.TEST_MODE != 'true' }} - uses: peter-evans/create-pull-request@v5 + uses: peter-evans/create-pull-request@v7 with: token: ${{ secrets.GITHUB_TOKEN }} base: master - head: ${{ env.BRANCH_NAME }} + branch: ${{ env.BRANCH_NAME }} title: "Version bump to ${{ env.TAG_PREFIX}}${{ env.NEW_VERSION }}" body: | This PR contains version bump changes for release ${{ env.TAG_PREFIX}}${{ env.NEW_VERSION }}. From 0cc506d93a67ff6086c2a6b669ed1d3065ede9c8 Mon Sep 17 00:00:00 2001 From: umberto di fabrizio Date: Fri, 28 Feb 2025 13:57:59 +0000 Subject: [PATCH 2/3] fix git add commit --- .github/workflows/version_bump.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/version_bump.yml b/.github/workflows/version_bump.yml index d74431e8c..5d238404a 100644 --- a/.github/workflows/version_bump.yml +++ b/.github/workflows/version_bump.yml @@ -112,7 +112,7 @@ jobs: run: | echo "Creating branch ${BRANCH_NAME}" git checkout -b ${BRANCH_NAME} - git add pyproject.toml darwin/__init__.py + git add pyproject.toml darwin/version/__init__.py git commit -m "Version bump to ${{ env.TAG_PREFIX}}${{ env.NEW_VERSION }}" git push origin ${BRANCH_NAME} env: From 4efc53e3d23a3eac2b0f764db1255678978fce66 Mon Sep 17 00:00:00 2001 From: umberto di fabrizio Date: Fri, 28 Feb 2025 14:25:30 +0000 Subject: [PATCH 3/3] fixing version_bump --- .github/workflows/version_bump.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/version_bump.yml b/.github/workflows/version_bump.yml index 5d238404a..49c7bc0de 100644 --- a/.github/workflows/version_bump.yml +++ b/.github/workflows/version_bump.yml @@ -89,7 +89,7 @@ jobs: echo "Adding test suffix" # Update version in pyproject.toml and in __init__.py awk -v new_version="$TEST_VERSION" '/^version = / {$0 = "version = \"" new_version "\""} 1' pyproject.toml > pyproject.tmp && mv pyproject.tmp pyproject.toml - awk -v new_version="$TEST_VERSION" '/^__version__ = / {$0 = "__version__ = \"" new_version "\""} 1' darwin/__init__.py > darwin/__init__.tmp && mv darwin/__init__.tmp darwin/__init__.py + awk -v new_version="$TEST_VERSION" '/^__version__ = / {$0 = "__version__ = \"" new_version "\""} 1' darwin/version/__init__.py > darwin/version/__init__.tmp && mv darwin/version/__init__.tmp darwin/version/__init__.py BRANCH_NAME="${TAG_PREFIX}branch-${NEW_VERSION}" else @@ -109,6 +109,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Create branch and commit changes + if: ${{ env.TEST_MODE == 'true' }} run: | echo "Creating branch ${BRANCH_NAME}" git checkout -b ${BRANCH_NAME}