Skip to content

Commit 4677671

Browse files
committed
Keep apk 'r' release prefix in built asset filenames
The rename step used bare ${PKG_RELEASE}, so the release asset was pkg-<ver>-5.apk while the SDK/local build produces pkg-<ver>-r5.apk. Compute a per-ext release token (apk -> r${PKG_RELEASE}, opkg unchanged) so 25.12 apk filenames keep the 'r', matching the local build and dev.mossdef.org.
1 parent 72c0872 commit 4677671

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

.github/workflows/openwrt-release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,11 @@ jobs:
224224
PKG_VERSION=$(grep -E '^PKG_VERSION *:?=' Makefile | head -n1 | cut -d= -f2 | tr -d '[:space:]')
225225
PKG_RELEASE=$(grep -E '^PKG_RELEASE *:?=' Makefile | head -n1 | cut -d= -f2 | tr -d '[:space:]')
226226
for ext in ipk apk; do
227+
# apk keeps OpenWrt's 'r' release prefix (…-r5.apk); opkg does not
228+
case "$ext" in apk) REL="r${PKG_RELEASE}" ;; *) REL="${PKG_RELEASE}" ;; esac
227229
for f in $(find bin/packages -type f -path "*/melmac/*.${ext}"); do
228230
dir=$(dirname "$f")
229-
mv -v "$f" "$dir/${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}_${{ matrix.version }}_${{ matrix.target }}.${ext}"
231+
mv -v "$f" "$dir/${PKG_NAME}-${PKG_VERSION}-${REL}_${{ matrix.version }}_${{ matrix.target }}.${ext}"
230232
done
231233
done
232234

0 commit comments

Comments
 (0)