Skip to content

Commit 9939a05

Browse files
committed
Correct APP_VERSION determine
1 parent a48d6d4 commit 9939a05

2 files changed

Lines changed: 2 additions & 6 deletions

File tree

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,7 @@ jobs:
4444
run: |
4545
FULL_VERSION=$(grep -oP 'VERSION\s+\K[0-9]+\.[0-9]+\.[0-9]+' omodsim/CMakeLists.txt)
4646
47-
if [ ! -z "${{ github.event.inputs.tag }}" ]; then
48-
APP_VERSION="${{ github.event.inputs.tag }}"
49-
elif [ "${GITHUB_REF_NAME}" = "dev" ]; then
47+
if [ "${GITHUB_REF_NAME}" = "dev" ] || [ "${{ github.event.inputs.branch }}" = "dev" ]; then
5048
MAJOR_MINOR=$(echo "$FULL_VERSION" | cut -d. -f1,2)
5149
APP_VERSION="${MAJOR_MINOR}~dev"
5250
else

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,7 @@ jobs:
4444
run: |
4545
FULL_VERSION=$(grep -oP 'VERSION\s+\K[0-9]+\.[0-9]+\.[0-9]+' omodsim/CMakeLists.txt)
4646
47-
if [ ! -z "${{ github.event.inputs.tag }}" ]; then
48-
APP_VERSION="${{ github.event.inputs.tag }}"
49-
elif [ "${GITHUB_REF_NAME}" = "dev" ]; then
47+
if [ "${GITHUB_REF_NAME}" = "dev" ] || [ "${{ github.event.inputs.branch }}" = "dev" ]; then
5048
MAJOR_MINOR=$(echo "$FULL_VERSION" | cut -d. -f1,2)
5149
APP_VERSION="${MAJOR_MINOR}~dev"
5250
else

0 commit comments

Comments
 (0)