diff options
| author | thecalcaholic <6317548+theCalcaholic@users.noreply.github.com> | 2022-07-21 22:05:50 +0300 |
|---|---|---|
| committer | thecalcaholic <6317548+theCalcaholic@users.noreply.github.com> | 2022-07-21 22:05:50 +0300 |
| commit | 52508e9c37e0de373587db309e6a6a32660d7a29 (patch) | |
| tree | 0c833cb508c87b21fabe77ecbba428973e9a03b4 | |
| parent | c77b0c45606094a5f23f5c20a8e40c6ed9ab757e (diff) | |
build-sd-images.yml: Make sure, IMG variable doesn't change during builds
| -rw-r--r-- | .github/workflows/build-sd-images.yml | 11 | ||||
| -rwxr-xr-x | build/build-SD-armbian.sh | 2 | ||||
| -rwxr-xr-x | build/build-SD-rpi.sh | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/.github/workflows/build-sd-images.yml b/.github/workflows/build-sd-images.yml index 86d92403..1608262d 100644 --- a/.github/workflows/build-sd-images.yml +++ b/.github/workflows/build-sd-images.yml @@ -27,14 +27,17 @@ jobs: with: ref: "${{ env.VERSION }}" - name: Build RPI SD Image + id: build-rpi run: | set -e + IMG="NextCloudPi_RPi_$( date "+%m-%d-%y" ).img" wget -q https://github.com/multiarch/qemu-user-static/releases/latest/download/qemu-aarch64-static -O ./qemu-aarch64-static ./build/build-SD-rpi.sh + echo "::set-output name=image::${IMG}" - name: Pack RPI Image id: pack-rpi run: | - IMG="NextCloudPi_RPi_$( date "+%m-%d-%y" ).img" + IMG="${{ steps.build-rpi.outputs.image }}" TAR="$( basename "$IMG" .img ).tar.gz" . ./build/buildlib.sh pack_image "tmp/$IMG" "output/$TAR" @@ -72,16 +75,18 @@ jobs: with: ref: "${{ env.VERSION }}" - name: "Build Armbian" + id: build-armbian run: | set -x export LIB_TAG=master board_params=(${{ matrix.board}}) + IMG="NextCloudPi_${board_params[1]}_$( date "+%m-%d-%y" ).img" ./build/build-SD-armbian.sh "${board_params[@]}" + echo "::set-output name=image::${IMG}" - name: "Pack image" id: pack-armbian run: | - board_params=(${{ matrix.board}}) - IMG="NextCloudPi_${board_params[1]}_$( date "+%m-%d-%y" ).img" + IMG="${{ steps.build-armbian.outputs.image }}" TAR="$( basename "$IMG" .img ).tar.gz" artifacts=("armbian/output/images/Armbian"*.img) diff --git a/build/build-SD-armbian.sh b/build/build-SD-armbian.sh index a7e3977d..fddc30c5 100755 --- a/build/build-SD-armbian.sh +++ b/build/build-SD-armbian.sh @@ -18,7 +18,7 @@ NCPCFG=etc/ncp.cfg echo -e "\e[1m\n[ Build NCP ${BNAME} ]\e[0m" -IMG="NextCloudPi_${BNAME}_$( date "+%m-%d-%y" ).img" +IMG="${IMG:-NextCloudPi_${BNAME}_$( date "+%m-%d-%y" ).img}" IMG=tmp/"$IMG" TAR=output/"$( basename "$IMG" .img ).tar.bz2" diff --git a/build/build-SD-rpi.sh b/build/build-SD-rpi.sh index 223aed65..256cdbe4 100755 --- a/build/build-SD-rpi.sh +++ b/build/build-SD-rpi.sh @@ -16,7 +16,7 @@ echo -e "\e[1m\n[ Build NCP Raspberry Pi ]\e[0m" URL="https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2022-01-28/2022-01-28-raspios-bullseye-arm64-lite.zip" SIZE=4G # Raspbian image size #CLEAN=0 # Pass this envvar to skip cleaning download cache -IMG="NextCloudPi_RPi_$( date "+%m-%d-%y" ).img" +IMG="${IMG:-NextCloudPi_RPi_$( date "+%m-%d-%y" ).img}" TAR=output/"$( basename "$IMG" .img ).tar.bz2" ############################################################################## |