From c745fca2ea61269ec1431f69e29ce6ab64245c17 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Mon, 13 Apr 2026 17:58:18 +0200 Subject: [PATCH] update draft-release.yml adhere to new workflow_call api --- .github/workflows/draft-release.yml | 24 ++++++++++++++++-------- .github/workflows/get-version.yml | 7 +++++++ 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index 354e782ae..0749b5c9d 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -69,31 +69,39 @@ jobs: cryptomator-*.tar.gz.asc build-exe-and-msi: - needs: create-release + needs: [get-version, create-release] uses: ./.github/workflows/win-exe.yml with: - is-release: true + semVerNum: ${{needs.get-version.outputs.semVerNum}} + revisionNum: ${{needs.get-version.outputs.revNum}} + semVerSuffix: ${{needs.get-version.outputs.semVerSuffix}} secrets: inherit build-dmg-arm64: - needs: create-release + needs: [get-version, create-release] uses: ./.github/workflows/mac-dmg.yml with: - is-release: true + semVerNum: ${{needs.get-version.outputs.semVerNum}} + revisionNum: ${{needs.get-version.outputs.revNum}} + semVerSuffix: ${{needs.get-version.outputs.semVerSuffix}} secrets: inherit build-dmg-x64: - needs: create-release + needs: [get-version, create-release] uses: ./.github/workflows/mac-dmg-x64.yml with: - is-release: true + semVerNum: ${{needs.get-version.outputs.semVerNum}} + revisionNum: ${{needs.get-version.outputs.revNum}} + semVerSuffix: ${{needs.get-version.outputs.semVerSuffix}} secrets: inherit build-appimages: - needs: create-release + needs: [get-version, create-release] uses: ./.github/workflows/appimage.yml with: - is-release: true + semVerNum: ${{needs.get-version.outputs.semVerNum}} + revisionNum: ${{needs.get-version.outputs.revNum}} + semVerSuffix: ${{needs.get-version.outputs.semVerSuffix}} secrets: inherit update-sha256sums: diff --git a/.github/workflows/get-version.yml b/.github/workflows/get-version.yml index 45056f700..124a3a138 100644 --- a/.github/workflows/get-version.yml +++ b/.github/workflows/get-version.yml @@ -14,6 +14,9 @@ on: semVerNum: description: "The numerical part of the version string" value: ${{ jobs.determine-version.outputs.semVerNum}} + semVerSuffix: + description: "The suffix of the version string" + value: ${{ jobs.determine-version.outputs.semVerSuffix}} revNum: description: "The revision number" value: ${{ jobs.determine-version.outputs.revNum}} @@ -32,6 +35,7 @@ jobs: outputs: semVerNum: ${{ steps.versions.outputs.semVerNum }} semVerStr: ${{ steps.versions.outputs.semVerStr }} + semVerSuffix: ${{ steps.versions.outputs.semVerSuffix }} revNum: ${{ steps.versions.outputs.revNum }} type: ${{ steps.versions.outputs.type}} steps: @@ -55,6 +59,7 @@ jobs: SEM_VER_STR=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout` fi SEM_VER_NUM=`echo ${SEM_VER_STR} | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+).*/\1/'` + SEM_VER_SUFFIX=`echo ${SEM_VER_STR} | sed -E 's/[0-9]+\.[0-9]+\.[0-9]+?(.*)/\1/'` REVCOUNT=`git rev-list --count HEAD` TYPE="unknown" if [[ $SEM_VER_STR =~ [0-9]+\.[0-9]+\.[0-9]+$ ]]; then @@ -68,6 +73,8 @@ jobs: fi echo "semVerStr=${SEM_VER_STR}" >> $GITHUB_OUTPUT echo "semVerNum=${SEM_VER_NUM}" >> $GITHUB_OUTPUT + echo "semVerSuffix=${SEM_VER_SUFFIX}" >> $GITHUB_OUTPUT + echo "revNum=${REVCOUNT}" >> $GITHUB_OUTPUT echo "type=${TYPE}" >> $GITHUB_OUTPUT env: