Skip to content

Commit cc687c1

Browse files
sanny32sanny32
committed
fix: Update actions versions and enhance version handling for release branches in workflows
1 parent 811adeb commit cc687c1

7 files changed

Lines changed: 31 additions & 31 deletions

‎.github/workflows/build-deb-qt5-amd64.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939

4040
steps:
4141
- name: Checkout repository
42-
uses: actions/checkout@v4
42+
uses: actions/checkout@v6
4343
with:
4444
ref: ${{ github.event.inputs.tag || github.event.inputs.branch || github.ref_name }}
4545

@@ -66,7 +66,7 @@ jobs:
6666
run: |
6767
FULL_VERSION=$(grep -oP 'VERSION\s+\K[0-9]+\.[0-9]+\.[0-9]+' src/CMakeLists.txt)
6868
69-
if [ "${GITHUB_REF_NAME}" = "dev" ] || [ "${{ github.event.inputs.branch }}" = "dev" ]; then
69+
if [ "${GITHUB_REF_NAME}" = "dev" ] || [ "${{ github.event.inputs.branch }}" = "dev" ] || [[ "${GITHUB_REF_NAME}" == release/* ]] || [[ "${{ github.event.inputs.branch }}" == release/* ]]; then
7070
MAJOR_MINOR=$(echo "$FULL_VERSION" | cut -d. -f1,2)
7171
APP_VERSION="${MAJOR_MINOR}~dev"
7272
else
@@ -238,7 +238,7 @@ jobs:
238238
run: dpkg-buildpackage -us -uc -tc -b
239239

240240
- name: Upload DEB package
241-
uses: actions/upload-artifact@v4
241+
uses: actions/upload-artifact@v7
242242
if: success()
243243
with:
244244
name: ${{ env.DEB_PACKAGE_NAME }}_${{ env.APP_VERSION }}-${{ env.DEB_REVISION }}_${{ env.DEB_ARCH }}

‎.github/workflows/build-deb-qt6-amd64.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040

4141
steps:
4242
- name: Checkout repository
43-
uses: actions/checkout@v4
43+
uses: actions/checkout@v6
4444
with:
4545
ref: ${{ github.event.inputs.tag || github.event.inputs.branch || github.ref_name }}
4646

@@ -67,7 +67,7 @@ jobs:
6767
run: |
6868
FULL_VERSION=$(grep -oP 'VERSION\s+\K[0-9]+\.[0-9]+\.[0-9]+' src/CMakeLists.txt)
6969
70-
if [ "${GITHUB_REF_NAME}" = "dev" ] || [ "${{ github.event.inputs.branch }}" = "dev" ]; then
70+
if [ "${GITHUB_REF_NAME}" = "dev" ] || [ "${{ github.event.inputs.branch }}" = "dev" ] || [[ "${GITHUB_REF_NAME}" == release/* ]] || [[ "${{ github.event.inputs.branch }}" == release/* ]]; then
7171
MAJOR_MINOR=$(echo "$FULL_VERSION" | cut -d. -f1,2)
7272
APP_VERSION="${MAJOR_MINOR}~dev"
7373
else
@@ -264,7 +264,7 @@ jobs:
264264
run: dpkg-buildpackage -us -uc -tc -b
265265

266266
- name: Upload DEB package
267-
uses: actions/upload-artifact@v4
267+
uses: actions/upload-artifact@v7
268268
if: success()
269269
with:
270270
name: ${{ env.DEB_PACKAGE_NAME }}_${{ env.APP_VERSION }}-${{ env.DEB_REVISION }}_${{ env.DEB_ARCH }}

‎.github/workflows/build-installer-qt5-win32.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242

4343
steps:
4444
- name: Checkout repository
45-
uses: actions/checkout@v4
45+
uses: actions/checkout@v6
4646
with:
4747
ref: ${{ github.event.inputs.tag || github.event.inputs.branch || github.ref_name }}
4848

@@ -52,7 +52,7 @@ jobs:
5252
shell: cmd
5353

5454
- name: Convert version for dev branch
55-
if: ${{ github.ref_name == 'dev' || github.event.inputs.branch == 'dev' }}
55+
if: ${{ github.ref_name == 'dev' || github.event.inputs.branch == 'dev' || startsWith(github.ref_name, 'release/') || startsWith(github.event.inputs.branch, 'release/') }}
5656
run: |
5757
for /f "tokens=1,2 delims=." %%a in ("%APP_VERSION%") do (
5858
echo APP_VERSION=%%a.%%b-dev>>%GITHUB_ENV%
@@ -91,7 +91,7 @@ jobs:
9191
shell: cmd
9292

9393
- name: Install Python (for aqtinstall)
94-
uses: actions/setup-python@v5
94+
uses: actions/setup-python@v6
9595
with:
9696
python-version: "3.11"
9797

@@ -137,7 +137,7 @@ jobs:
137137

138138
- name: Upload Executable
139139
id: upload-exe
140-
uses: actions/upload-artifact@v4
140+
uses: actions/upload-artifact@v7
141141
if: success()
142142
with:
143143
name: omodsim-${{ env.APP_VERSION }}_${{ env.ARCH }}.exe
@@ -158,7 +158,7 @@ jobs:
158158
wait-for-completion-timeout-in-seconds: 3600
159159

160160
- name: Upload signed Executable
161-
uses: actions/upload-artifact@v4
161+
uses: actions/upload-artifact@v7
162162
if: success() && env.SIGNING_POLICY_SLUG != 'none'
163163
with:
164164
name: omodsim-${{ env.APP_VERSION }}_${{ env.ARCH }}-signed.exe
@@ -197,7 +197,7 @@ jobs:
197197

198198
- name: Upload Installer
199199
id: upload-installer
200-
uses: actions/upload-artifact@v4
200+
uses: actions/upload-artifact@v7
201201
if: success()
202202
with:
203203
name: qt5-omodsim-${{ env.APP_VERSION }}_${{ env.ARCH }}
@@ -218,7 +218,7 @@ jobs:
218218
wait-for-completion-timeout-in-seconds: 3600
219219

220220
- name: Upload signed Installer
221-
uses: actions/upload-artifact@v4
221+
uses: actions/upload-artifact@v7
222222
if: success() && env.SIGNING_POLICY_SLUG != 'none'
223223
with:
224224
name: qt5-omodsim-${{ env.APP_VERSION }}_${{ env.ARCH }}-signed

‎.github/workflows/build-installer-qt5-win64.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141

4242
steps:
4343
- name: Checkout repository
44-
uses: actions/checkout@v4
44+
uses: actions/checkout@v6
4545
with:
4646
ref: ${{ github.event.inputs.tag || github.event.inputs.branch || github.ref_name }}
4747

@@ -51,7 +51,7 @@ jobs:
5151
shell: cmd
5252

5353
- name: Convert version for dev branch
54-
if: ${{ github.ref_name == 'dev' || github.event.inputs.branch == 'dev' }}
54+
if: ${{ github.ref_name == 'dev' || github.event.inputs.branch == 'dev' || startsWith(github.ref_name, 'release/') || startsWith(github.event.inputs.branch, 'release/') }}
5555
run: |
5656
for /f "tokens=1,2 delims=." %%a in ("%APP_VERSION%") do (
5757
echo APP_VERSION=%%a.%%b-dev>>%GITHUB_ENV%
@@ -90,7 +90,7 @@ jobs:
9090
shell: cmd
9191

9292
- name: Install Python (for aqtinstall)
93-
uses: actions/setup-python@v5
93+
uses: actions/setup-python@v6
9494
with:
9595
python-version: "3.11"
9696

@@ -136,7 +136,7 @@ jobs:
136136

137137
- name: Upload Executable
138138
id: upload-exe
139-
uses: actions/upload-artifact@v4
139+
uses: actions/upload-artifact@v7
140140
if: success()
141141
with:
142142
name: omodsim-${{ env.APP_VERSION }}_${{ env.CMAKE_ARCH }}.exe
@@ -157,7 +157,7 @@ jobs:
157157
wait-for-completion-timeout-in-seconds: 3600
158158

159159
- name: Upload signed Executable
160-
uses: actions/upload-artifact@v4
160+
uses: actions/upload-artifact@v7
161161
if: success() && env.SIGNING_POLICY_SLUG != 'none'
162162
with:
163163
name: omodsim-${{ env.APP_VERSION }}_${{ env.CMAKE_ARCH }}-signed.exe
@@ -196,7 +196,7 @@ jobs:
196196

197197
- name: Upload Installer
198198
id: upload-installer
199-
uses: actions/upload-artifact@v4
199+
uses: actions/upload-artifact@v7
200200
if: success()
201201
with:
202202
name: qt5-omodsim-${{ env.APP_VERSION }}_${{ env.CMAKE_ARCH }}
@@ -217,7 +217,7 @@ jobs:
217217
wait-for-completion-timeout-in-seconds: 3600
218218

219219
- name: Upload signed Installer
220-
uses: actions/upload-artifact@v4
220+
uses: actions/upload-artifact@v7
221221
if: success() && env.SIGNING_POLICY_SLUG != 'none'
222222
with:
223223
name: qt5-omodsim-${{ env.APP_VERSION }}_${{ env.CMAKE_ARCH }}-signed

‎.github/workflows/build-installer-qt6-win64.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141

4242
steps:
4343
- name: Checkout repository
44-
uses: actions/checkout@v4
44+
uses: actions/checkout@v6
4545
with:
4646
ref: ${{ github.event.inputs.tag || github.event.inputs.branch || github.ref_name }}
4747

@@ -90,7 +90,7 @@ jobs:
9090
shell: cmd
9191

9292
- name: Install Python (for aqtinstall)
93-
uses: actions/setup-python@v5
93+
uses: actions/setup-python@v6
9494
with:
9595
python-version: "3.11"
9696

@@ -131,7 +131,7 @@ jobs:
131131

132132
- name: Upload Executable
133133
id: upload-exe
134-
uses: actions/upload-artifact@v4
134+
uses: actions/upload-artifact@v7
135135
if: success()
136136
with:
137137
name: omodsim-${{ env.APP_VERSION }}_${{ env.CMAKE_ARCH }}.exe
@@ -152,7 +152,7 @@ jobs:
152152
wait-for-completion-timeout-in-seconds: 3600
153153

154154
- name: Upload signed Executable
155-
uses: actions/upload-artifact@v4
155+
uses: actions/upload-artifact@v7
156156
if: success() && env.SIGNING_POLICY_SLUG != 'none'
157157
with:
158158
name: omodsim-${{ env.APP_VERSION }}_${{ env.CMAKE_ARCH }}-signed.exe
@@ -201,7 +201,7 @@ jobs:
201201

202202
- name: Upload Installer
203203
id: upload-installer
204-
uses: actions/upload-artifact@v4
204+
uses: actions/upload-artifact@v7
205205
if: success()
206206
with:
207207
name: qt6-omodsim-${{ env.APP_VERSION }}_${{ env.CMAKE_ARCH }}
@@ -222,7 +222,7 @@ jobs:
222222
wait-for-completion-timeout-in-seconds: 3600
223223

224224
- name: Upload signed Installer
225-
uses: actions/upload-artifact@v4
225+
uses: actions/upload-artifact@v7
226226
if: success() && env.SIGNING_POLICY_SLUG != 'none'
227227
with:
228228
name: qt6-omodsim-${{ env.APP_VERSION }}_${{ env.CMAKE_ARCH }}-signed

‎.github/workflows/build-rpm-qt6-x86_64.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040

4141
steps:
4242
- name: Checkout repository
43-
uses: actions/checkout@v4
43+
uses: actions/checkout@v6
4444
with:
4545
ref: ${{ github.event.inputs.tag || github.event.inputs.branch || github.ref_name }}
4646

@@ -67,7 +67,7 @@ jobs:
6767
run: |
6868
FULL_VERSION=$(grep -oP 'VERSION\s+\K[0-9]+\.[0-9]+\.[0-9]+' src/CMakeLists.txt)
6969
70-
if [ "${GITHUB_REF_NAME}" = "dev" ] || [ "${{ github.event.inputs.branch }}" = "dev" ]; then
70+
if [ "${GITHUB_REF_NAME}" = "dev" ] || [ "${{ github.event.inputs.branch }}" = "dev" ] || [[ "${GITHUB_REF_NAME}" == release/* ]] || [[ "${{ github.event.inputs.branch }}" == release/* ]]; then
7171
MAJOR_MINOR=$(echo "$FULL_VERSION" | cut -d. -f1,2)
7272
APP_VERSION="${MAJOR_MINOR}~dev"
7373
else
@@ -258,7 +258,7 @@ jobs:
258258
fi
259259
260260
- name: Upload RPM package
261-
uses: actions/upload-artifact@v4
261+
uses: actions/upload-artifact@v7
262262
if: success()
263263
with:
264264
name: ${{ env.RPM_PACKAGE_NAME }}-${{ env.APP_VERSION }}-${{ env.RPM_REVISION }}.${{ env.RPM_ARCH }}
@@ -271,7 +271,7 @@ jobs:
271271
echo "$GPG_PUBLIC_KEY" > ${{ env.RPM_PACKAGE_NAME }}.rpm.pubkey
272272
273273
- name: Upload public GPG key
274-
uses: actions/upload-artifact@v4
274+
uses: actions/upload-artifact@v7
275275
with:
276276
name: ${{ env.RPM_PACKAGE_NAME }}.rpm.pubkey
277277
path: ${{ env.RPM_PACKAGE_NAME }}.rpm.pubkey

‎src/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ else()
8181
endif()
8282
endif()
8383

84-
if(${GIT_BRANCH} MATCHES dev)
84+
if(${GIT_BRANCH} MATCHES dev OR ${GIT_BRANCH} MATCHES "release/")
8585
set(PROJECT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}-dev)
8686
endif()
8787

0 commit comments

Comments
 (0)