OpenIPC
/
firmware
mirror of https://github.com/OpenIPC/firmware.git
1
0
Fork 0
Code Activity

Exchange flash type and release name in artifacts (#539)

pull/546/head
Dmitry Ilyin 2022-11-05 17:06:31 +03:00 committed by GitHub
parent e4e47c7ab9
commit fe6cf7e8a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/matrix_build.yml vendored
View File

@ -484,7 +484,7 @@ jobs:
;; ;;
esac esac
NORFW_PATH="${IMAGES_DIR}/openipc.${{ matrix.platform }}-${{ matrix.release }}-nor.tgz" NORFW_PATH="${IMAGES_DIR}/openipc.${{ matrix.platform }}-nor-${{ matrix.release }}.tgz"
echo "NORFW_PATH=$NORFW_PATH" >> $GITHUB_ENV echo "NORFW_PATH=$NORFW_PATH" >> $GITHUB_ENV
NORFW_FILE=$(basename $NORFW_PATH) NORFW_FILE=$(basename $NORFW_PATH)
echo "NORFW_FILE=$NORFW_FILE" >> $GITHUB_ENV echo "NORFW_FILE=$NORFW_FILE" >> $GITHUB_ENV
@ -497,7 +497,7 @@ jobs:
fi fi
if [ -f rootfs.ubifs ] ; then if [ -f rootfs.ubifs ] ; then
NANDFW_PATH="${IMAGES_DIR}/openipc.${{ matrix.platform }}-${{ matrix.release }}-nand.tgz" NANDFW_PATH="${IMAGES_DIR}/openipc.${{ matrix.platform }}-nand-${{ matrix.release }}.tgz"
echo "NANDFW_PATH=$NANDFW_PATH" >> $GITHUB_ENV echo "NANDFW_PATH=$NANDFW_PATH" >> $GITHUB_ENV
NANDFW_FILE=$(basename $NANDFW_PATH) NANDFW_FILE=$(basename $NANDFW_PATH)
echo "NANDFW_FILE=$NANDFW_FILE" >> $GITHUB_ENV echo "NANDFW_FILE=$NANDFW_FILE" >> $GITHUB_ENV

4
general/overlay/usr/sbin/sysupgrade
View File

@ -3,7 +3,7 @@
# OpenIPC.org | v.20220831 # OpenIPC.org | v.20220831
# #
scr_version=1.0.11 scr_version=1.0.12
args=" $@" args=" $@"
@ -78,7 +78,7 @@ download_firmware() {
echo_c 33 "\nFirmware" echo_c 33 "\nFirmware"
osr=$(get_system_build) osr=$(get_system_build)
ftype=$(get_flash_type) ftype=$(get_flash_type)
build="${soc}-${osr}-${ftype}" build="${soc}-${ftype}-${osr}"
[ -z "$url" ] && url="https://github.com/OpenIPC/firmware/releases/download/latest/openipc.${build}.tgz" [ -z "$url" ] && url="https://github.com/OpenIPC/firmware/releases/download/latest/openipc.${build}.tgz"
echo "Download from $url" echo "Download from $url"
[ -z "$HASERLVER" ] && progress="-#" || progress="-s" [ -z "$HASERLVER" ] && progress="-#" || progress="-s"