From bbc9904b3e1eb6c3ac96d34533e20eba917a10f6 Mon Sep 17 00:00:00 2001 From: AuxXxilium Date: Sun, 10 Nov 2024 11:08:35 +0100 Subject: [PATCH] build: update Signed-off-by: AuxXxilium --- .github/workflows/autobuild.yml | 7 +++---- .github/workflows/build.yml | 7 +++---- files/initrd/opt/arc/include/update.sh | 8 ++++---- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 86191520..5d9283be 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -225,12 +225,12 @@ jobs: if: success() && env.ARC_VERSION != '' uses: ncipollo/release-action@v1 with: - tag: ${{ env.ARC_VERSION }}-${{ env.ARC_BUILD }} + tag: ${{ env.ARC_VERSION }} prerelease: true makeLatest: false allowUpdates: true body: | - ### Notice: + ### Note: - Development Build ### Information: @@ -243,9 +243,8 @@ jobs: - Patches: ${{ env.PATCHTAG }} - Custom: ${{ env.CUSTOMTAG }} - LKMs: ${{ env.LKMTAG }} - - Theme: ${{ env.THEMETAG }} - - Buildroot Next: ${{ env.BRXTAG }} - Buildroot Stable: ${{ env.BRSTAG }} + - Buildroot Next: ${{ env.BRXTAG }} ### Release - ${{ env.BUILD_TIME }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4760772a..f96565d1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -261,12 +261,12 @@ jobs: if: success() && env.ARC_VERSION != '' uses: ncipollo/release-action@v1 with: - tag: ${{ env.ARC_VERSION }}-${{ env.ARC_BUILD }} + tag: ${{ env.ARC_VERSION }} prerelease: ${{ inputs.prerelease }} makeLatest: ${{ inputs.latest }} allowUpdates: true body: | - ### Notice: + ### Note: - ${{ inputs.notice }} ### Information: @@ -283,9 +283,8 @@ jobs: - Patches: ${{ env.PATCHTAG }} - Custom: ${{ env.CUSTOMTAG }} - LKMs: ${{ env.LKMTAG }} - - Theme: ${{ env.THEMETAG }} - - Buildroot Next: ${{ env.BRXTAG }} - Buildroot Stable: ${{ env.BRSTAG }} + - Buildroot Next: ${{ env.BRXTAG }} ### Release - ${{ env.BUILD_TIME }} diff --git a/files/initrd/opt/arc/include/update.sh b/files/initrd/opt/arc/include/update.sh index 0e33c1a5..51a304b8 100755 --- a/files/initrd/opt/arc/include/update.sh +++ b/files/initrd/opt/arc/include/update.sh @@ -50,7 +50,7 @@ function updateLoader() { sleep 2 else if [ "${ARCMODE}" == "update" ]; then - dialog --backtitle "$(backtitle)" --title "Update Dependencies" --aspect 18 \ + dialog --backtitle "$(backtitle)" --title "Update Loader" --aspect 18 \ --infobox "Update failed!\nTry again later." 0 0 sleep 3 exec reboot @@ -60,7 +60,7 @@ function updateLoader() { fi else if [ "${ARCMODE}" == "update" ]; then - dialog --backtitle "$(backtitle)" --title "Update Dependencies" --aspect 18 \ + dialog --backtitle "$(backtitle)" --title "Update Loader" --aspect 18 \ --infobox "Update failed!\nTry again later." 0 0 sleep 3 exec reboot @@ -72,13 +72,13 @@ function updateLoader() { [ -n "${ARCCONF}" ] && cp -f "${TMP_PATH}/bak.yml" "${S_FILE}" if [ "${ARCMODE}" == "update" ] && [ "${CONFDONE}" == "true" ]; then dialog --backtitle "$(backtitle)" --title "Update Loader" --aspect 18 \ - --infobox "Update successful! -> Reboot to automated Build Mode..." 5 80 + --infobox "Update successful! -> Reboot to automated Build Mode..." 3 60 sleep 3 writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}" rebootTo "automated" else dialog --backtitle "$(backtitle)" --title "Update Loader" --aspect 18 \ - --infobox "Update successful! -> Reboot to Config Mode..." 5 80 + --infobox "Update successful! -> Reboot to Config Mode..." 3 50 sleep 3 writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}" rebootTo "config"