From baca9412a88b26c31681ba06b1d5fe3b448668e0 Mon Sep 17 00:00:00 2001 From: Xargon Date: Wed, 25 May 2022 22:27:51 +0900 Subject: [PATCH] VERSIONING: fixed in ES-DE -fix6 --- net.retrodeck.retrodeck.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 30de6143..68139131 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -72,12 +72,20 @@ modules: - name: version-initialization buildsystem: simple build-commands: - - mkdir -p ${FLATPAK_DEST}/retrodeck/ - - VERSION="cooker" - - if [[ $VERSION == "cooker" ]]; then VERSION=$(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/')-$(date +'%Y%m%d_%H%M'); fi - - echo $VERSION >> ${FLATPAK_DEST}/retrodeck/version - - echo "DEBUG - reading version " - - cat ${FLATPAK_DEST}/retrodeck/version + - | + git checkout ${GITHUB_REF_NAME} + mkdir -p ${FLATPAK_DEST}/retrodeck/ + VERSION="cooker" + if [[ $VERSION == "cooker" ]]; + then + VERSION=$(git describe --tags | tr - .) + fi + echo $VERSION >> ${FLATPAK_DEST}/retrodeck/version + cat ${FLATPAK_DEST}/retrodeck/version + sources: + - type: git + url: https://github.com/XargonWan/RetroDECK.git + branch: cooker - name: xmlstarlet config-opts: