From 4455096619c16915c7a19c3b211fd996b29fb3e1 Mon Sep 17 00:00:00 2001 From: fboundy Date: Tue, 31 Dec 2024 14:42:51 +0000 Subject: [PATCH 1/2] Updated workflow --- .github/workflows/auto_release.yaml | 40 ++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/.github/workflows/auto_release.yaml b/.github/workflows/auto_release.yaml index fb2a6cf..a46334d 100644 --- a/.github/workflows/auto_release.yaml +++ b/.github/workflows/auto_release.yaml @@ -16,22 +16,28 @@ jobs: with: fetch-depth: 0 - - name: Fetch main branch into a detached HEAD - run: | - git fetch origin main - git checkout origin/main -b temp-main-branch + - name: Fetch main branch + run: git fetch origin main:main - name: Get VERSION from patch branch id: get_patch_version run: | - VERSION=$(grep -m 1 -oP '^VERSION=\K.*' VERSION_FILE) + VERSION=$(grep -m 1 -oP '(?<=^VERSION = ")[^"]+' apps/pv_opt/pv_opt.py) + if [ -z "$VERSION" ]; then + echo "Error: VERSION not found in apps/pv_opt/pv_opt.py on patch branch." >&2 + exit 1 + fi echo "patch_version=$VERSION" >> $GITHUB_ENV - name: Get VERSION from main branch id: get_main_version run: | - git checkout temp-main-branch - VERSION=$(grep -m 1 -oP '^VERSION=\K.*' VERSION_FILE) + git checkout main + VERSION=$(grep -m 1 -oP '(?<=^VERSION = ")[^"]+' apps/pv_opt/pv_opt.py) + if [ -z "$VERSION" ]; then + echo "Error: VERSION not found in apps/pv_opt/pv_opt.py on main branch." >&2 + exit 1 + fi echo "main_version=$VERSION" >> $GITHUB_ENV - name: Validate version increment @@ -44,7 +50,27 @@ jobs: main_patch=$(echo "$main_version" | awk -F '.' '{print $3}') patch_patch=$(echo "$patch_version" | awk -F '.' '{print $3}') + # Check if the patch version is incremented correctly + if [ "$patch_patch" -ne $((main_patch + 1)) ]; then + echo "Error: PATCH version is not incremented correctly." >&2 + echo "Main version: $main_version, Patch version: $patch_version" >&2 + exit 1 + fi + + - name: Update README.md version + run: | + sed -i "1s/v[0-9]*\.[0-9]*\.[0-9]*/v$patch_version/" README.md + - name: Commit README.md changes + run: | + git config user.name "GitHub Actions" + git config user.email "actions@github.com" + git add README.md + git commit -m "Update README.md version to $patch_version" + + - name: Push changes back to patch branch + run: | + git push origin HEAD:patch publish-release: name: Publish Release From d33ff9c311df7b2657da3213238d0ccb192e45d4 Mon Sep 17 00:00:00 2001 From: fboundy Date: Tue, 31 Dec 2024 14:43:41 +0000 Subject: [PATCH 2/2] Update workflows --- .github/workflows/black.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/black.yaml b/.github/workflows/black.yaml index d636e3b..e892d13 100644 --- a/.github/workflows/black.yaml +++ b/.github/workflows/black.yaml @@ -1,7 +1,6 @@ name: Auto-format Code with Debugging on: - push: pull_request: jobs: