From 1fdff423f5dbdc17edffd8ab55fab8510173e52b Mon Sep 17 00:00:00 2001 From: Albrecht Lohofener Date: Wed, 4 Sep 2024 20:23:47 +0200 Subject: [PATCH] Add date and time to u-os version number --- .github/workflows/build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e21438a..54b1bb6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -72,13 +72,16 @@ jobs: - name: Create Weidmueller u-OS app id: create_u-os-app run: | + # uc-aom-packager accept only version that has to be greater than the previous one. Lets use the datetime to ensure that. + DATETIME=$(date "+%Y%m%d%H%M%S") + # uc-aom-packager allow only decimal numbers as version number for an unkonwn reason # see https://github.com/weidmueller/uc-addon/blob/main/uc-manifest.schema-doc.md#version) # So lets convert the git hash into a decimal value GIT_HASH_DECIMAL=$((16#$GIT_HASH)) # Create app version - APP_VERSION=$OPENWRT_VERSION-$GIT_HASH_DECIMAL + APP_VERSION=$OPENWRT_VERSION.DATETIME-$GIT_HASH_DECIMAL echo "***** Create manifest from template *****" mv u-os-app/manifest.json.template u-os-app/manifest.json @@ -86,6 +89,7 @@ jobs: cat u-os-app/manifest.json | grep version echo "***** Run uc-aom-packager to create the u-OS app *****" + # uc-aom-packager accepts only multiarch images. "--build-arg BUILDKIT_MULTI_PLATFORM=1" has to set to ensure that. docker run --rm --network=host --pull=always \ --mount src=$(pwd)/u-os-app,target=/tmp/u-os-app-openwrt,type=bind wmucdev.azurecr.io/u-control/uc-aom-packager:0 \ uc-aom-packager push \