@@ -102,9 +102,9 @@ jobs:
102102 echo "Using version: ${{ env.VERSION }}"
103103
104104 # Update CMakeLists.txt version definitions
105- sed -i -E "s/(ESP32_LEPTON_LIB_MAJOR= )[0-9]+/\1${{ env.MAJOR }}/" CMakeLists.txt
106- sed -i -E "s/(ESP32_LEPTON_LIB_MINOR= )[0-9]+/\1${{ env.MINOR }}/" CMakeLists.txt
107- sed -i -E "s/(ESP32_LEPTON_LIB_BUILD= )[0-9]+/\1${{ env.BUILD }}/" CMakeLists.txt
105+ sed -i -E "s/(ESP32_LEPTON_LIB_MAJOR\s+ )[0-9]+/\1${{ env.MAJOR }}/" CMakeLists.txt
106+ sed -i -E "s/(ESP32_LEPTON_LIB_MINOR\s+ )[0-9]+/\1${{ env.MINOR }}/" CMakeLists.txt
107+ sed -i -E "s/(ESP32_LEPTON_LIB_BUILD\s+ )[0-9]+/\1${{ env.BUILD }}/" CMakeLists.txt
108108
109109 # Update idf_component.yml version field
110110 sed -i -E "s/^version: \".*\"/version: \"${{ env.VERSION }}\"/" idf_component.yml
@@ -116,7 +116,7 @@ jobs:
116116 commit_message : Push outputs from CI/CD (${{ env.DATE }})
117117
118118 release_changelog_update :
119- if : github.ref_type == 'branch' && github.ref_name == 'main'
119+ if : github.ref_type == 'branch' && ( github.ref_name == 'main' || github.ref_name == 'master')
120120 runs-on : ubuntu-latest
121121
122122 steps :
@@ -128,30 +128,35 @@ jobs:
128128 mkdir -p log
129129 echo "DATE=$(date +'%Y-%m-%d %H:%M:%S')" >> "${GITHUB_ENV}"
130130
131- - name : Get release version from CMakeLists.txt
131+ - name : Get release version
132132 run : |
133- # Extract version from CMakeLists.txt
134- MAJOR=$(grep -oP 'ESP32_LEPTON_LIB_MAJOR=\K[0-9]+' CMakeLists.txt)
135- MINOR=$(grep -oP 'ESP32_LEPTON_LIB_MINOR=\K[0-9]+' CMakeLists.txt)
136- BUILD=$(grep -oP 'ESP32_LEPTON_LIB_BUILD=\K[0-9]+' CMakeLists.txt)
137-
138- VERSION="${MAJOR}.${MINOR}.${BUILD}"
139-
133+ BRANCH_NAME="${GITHUB_REF_NAME}"
134+ echo "BRANCH_NAME=${BRANCH_NAME}"
135+ BASE_VERSION="${BRANCH_NAME%%_*}"
136+
137+ IFS='.' read -r MAJOR MINOR BUILD <<< "${BASE_VERSION}"
138+
140139 echo "MAJOR=${MAJOR}" >> ${GITHUB_ENV}
141140 echo "MINOR=${MINOR}" >> ${GITHUB_ENV}
142141 echo "BUILD=${BUILD}" >> ${GITHUB_ENV}
143- echo "VERSION=${VERSION}" >> ${GITHUB_ENV}
144-
145- echo "Extracted version: ${VERSION}"
142+ echo "VERSION=${BASE_VERSION}" >> ${GITHUB_ENV}
143+
144+ - name : Update version numbers
145+ shell : bash
146+ run : |
147+ echo "Using version: ${{ env.VERSION }}"
148+ sed -i -E "s/(ESP32_LEPTON_LIB_MAJOR=)[0-9]+/\1${{ env.MAJOR }}/" CMakeLists.txt
149+ sed -i -E "s/(ESP32_LEPTON_LIB_MINOR=)[0-9]+/\1${{ env.MINOR }}/" CMakeLists.txt
150+ sed -i -E "s/(ESP32_LEPTON_LIB_BUILD=)[0-9]+/\1${{ env.BUILD }}/" CMakeLists.txt
146151
147152 - name : Update CHANGELOG for release
148153 shell : bash
149154 run : |
150155 echo "Updating CHANGELOG with version: ${{ env.VERSION }}"
151-
156+
152157 # Replace ## [Unreleased] with version and date
153158 sed -i "s/^## \[Unreleased\]/## [${{ env.VERSION }}] - $(date +'%Y-%m-%d')/" CHANGELOG.md
154-
159+
155160 # Add new [Unreleased] section at the top
156161 sed -i '/^# CHANGELOG/a \\n## [Unreleased]' CHANGELOG.md
157162
0 commit comments