WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 3011c64

Browse files
authored
Use next patch version when using main action script
Updated the version resolution logic to prefer workflow input and increment the patch version correctly. This will prevent auto downgrading from stable repository.
1 parent 347a93f commit 3011c64

File tree

1 file changed

+27
-3
lines changed

1 file changed

+27
-3
lines changed

action.yml

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,33 @@ runs:
140140
- shell: bash
141141
run: |
142142
143-
# read version from upstream Armbian OS
144-
cat os/stable.json | jq '.version' | sed "s/\"//g" | sed 's/^/ARMBIAN_VERSION=/' >> $GITHUB_ENV
145-
[[ "${{ inputs.armbian_version }}" != '' ]] && echo "ARMBIAN_VERSION=${{ inputs.armbian_version }}" >> $GITHUB_ENV
143+
# Resolve base version (prefer workflow input if provided)
144+
BASE_VERSION="${{ inputs.armbian_version }}"
145+
if [ -z "$BASE_VERSION" ]; then
146+
BASE_VERSION="$(jq -r '.version' os/stable.json)"
147+
fi
148+
149+
# Preserve optional 'v' prefix but strip it for math
150+
PREFIX=''
151+
if [[ "$BASE_VERSION" == v* ]]; then
152+
PREFIX='v'
153+
BASE_NO_PREFIX="${BASE_VERSION#v}"
154+
else
155+
BASE_NO_PREFIX="$BASE_VERSION"
156+
fi
157+
158+
# Drop any pre-release/build metadata (e.g., -rc1, +meta)
159+
CORE="${BASE_NO_PREFIX%%[-+]*}"
160+
161+
# Split and increment patch
162+
IFS='.' read -r MAJOR MINOR PATCH <<<"$CORE"
163+
PATCH=${PATCH:-0}
164+
NEXT_PATCH=$((PATCH + 1))
165+
NEXT_VERSION="${PREFIX}${MAJOR}.${MINOR}.${NEXT_PATCH}"
166+
167+
{
168+
echo "ARMBIAN_VERSION=${NEXT_VERSION}"
169+
} >> "$GITHUB_ENV"
146170
147171
# copy os userpatches and custom
148172
mkdir -pv build/userpatches

0 commit comments

Comments
 (0)