diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bac04403..add7a57c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,4 +1,11 @@ -name: Build image +# +# Copyright (C) 2022 Ing +# +# This is free software, licensed under the MIT License. +# See /LICENSE for more information. +# + +name: Build arpl on: push: @@ -6,6 +13,10 @@ on: - main tags: - v* + + release: + types: [published] + workflow_dispatch: inputs: version: @@ -78,7 +89,7 @@ jobs: run: | # Calculate version VERSION="" - if [ ${{ github.event_name }} == 'push' -a ${{ github.ref_type }} == 'tag' ]; then + if [[ "${{ github.event_name }}" =~ ^(push|release)$ && "${{ github.ref_type }}" == 'tag' ]]; then VERSION="${{ github.ref_name }}" elif [ -n "${{ inputs.version }}" ]; then if [ "`echo ${{ inputs.version }} | cut -d '.' -f 1,2`" = "`date +'%y.%-m'`" ]; then diff --git a/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh b/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh index 7bc5ed5e..469137ab 100755 --- a/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh +++ b/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh @@ -145,6 +145,7 @@ installAddon eudev echo "/addons/eudev.sh \${1} " >> "${RAMDISK_PATH}/addons/addons.sh" 2>"${LOG_FILE}" || dieLog installAddon disks echo "/addons/disks.sh \${1} ${DT} ${UNIQUE}" >> "${RAMDISK_PATH}/addons/addons.sh" 2>"${LOG_FILE}" || dieLog +[ -f "/mnt/p1/model.dts" ] && cp "/mnt/p1/model.dts" "${RAMDISK_PATH}/addons/model.dts" installAddon wol echo "/addons/wol.sh \${1} " >> "${RAMDISK_PATH}/addons/addons.sh" 2>"${LOG_FILE}" || dieLog # User addons