From 402085fa69d0b9e243689cff682d33f1dea9fa47 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Wed, 10 Jan 2024 13:02:48 -0800
Subject: [PATCH] build-system: use GitHub Actions outputs

Tempting as it is to think this is just like bash - yaml isn't bash at all.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 .github/workflows/android.yml           | 4 +++-
 .github/workflows/linux-trusty-5.12.yml | 6 ++++--
 .github/workflows/mac.yml               | 4 +++-
 .github/workflows/post-releasenotes.yml | 4 +++-
 .github/workflows/windows.yml           | 5 ++++-
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index f16a78ceb..4e1c5ed96 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -26,6 +26,8 @@ jobs:
       if: github.event_name == 'push'
       run: |
         bash scripts/get-atomic-buildnr.sh ${{ github.sha }} ${{ secrets.NIGHTLY_BUILDS }} "CICD-release"
+        version=$(<release-version)
+        echo "version=$version" >> $GITHUB_OUTPUT
 
     - name: store dummy version and build number for non-push build runs
       if: github.event_name != 'push'
@@ -69,7 +71,7 @@ jobs:
       if: github.event_name == 'push'
       uses: softprops/action-gh-release@v1
       with:
-        tag_name: v$(<release-version)
+        tag_name: v${{ steps.version_number.outputs.version }}
         repository: subsurface/nightly-builds
         token: ${{ secrets.NIGHTLY_BUILDS }}
         prerelease: false
diff --git a/.github/workflows/linux-trusty-5.12.yml b/.github/workflows/linux-trusty-5.12.yml
index daa43acde..43a5bb79d 100644
--- a/.github/workflows/linux-trusty-5.12.yml
+++ b/.github/workflows/linux-trusty-5.12.yml
@@ -22,6 +22,8 @@ jobs:
       if: github.event_name == 'push'
       run: |
         bash scripts/get-atomic-buildnr.sh ${{ github.sha }} ${{ secrets.NIGHTLY_BUILDS }} "CICD-release"
+        version=$(<release-version)
+        echo "version=$version" >> $GITHUB_OUTPUT
 
     - name: store dummy version and build number for pull request
       if: github.event_name == 'pull_request'
@@ -55,14 +57,14 @@ jobs:
     - name: prepare release artifacts
       if: github.event_name == 'push'
       run: |
-        mv Subsurface.AppImage Subsurface-v(<release-version).AppImage
+        mv Subsurface.AppImage Subsurface-v${{ steps.version_number.outputs.version }}.AppImage
 
     # only publish a 'release' on push events (those include merging a PR)
     - name: upload binaries
       if: github.event_name == 'push'
       uses: softprops/action-gh-release@v1
       with:
-        tag_name: v$(<release-version)
+        tag_name: v${{ steps.version_number.outputs.version }}
         repository: subsurface/nightly-builds
         token: ${{ secrets.NIGHTLY_BUILDS }}
         prerelease: false
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index f333ab84b..9068ce82d 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -19,6 +19,8 @@ jobs:
       if: github.event_name == 'push'
       run: |
         bash scripts/get-atomic-buildnr.sh ${{ github.sha }} ${{ secrets.NIGHTLY_BUILDS }} "CICD-release"
+        version=$(<release-version)
+        echo "version=$version" >> $GITHUB_OUTPUT
 
     - name: store dummy version and build number for pull request
       if: github.event_name == 'pull_request'
@@ -58,7 +60,7 @@ jobs:
       if: github.event_name == 'push'
       uses: softprops/action-gh-release@v1
       with:
-        tag_name: v$(<release-version)
+        tag_name: v${{ steps.version_number.outputs.version }}
         repository: subsurface/nightly-builds
         token: ${{ secrets.NIGHTLY_BUILDS }}
         prerelease: false
diff --git a/.github/workflows/post-releasenotes.yml b/.github/workflows/post-releasenotes.yml
index fc6b47a91..57cde85c4 100644
--- a/.github/workflows/post-releasenotes.yml
+++ b/.github/workflows/post-releasenotes.yml
@@ -23,13 +23,15 @@ jobs:
       run: |
         bash -x ./scripts/get-atomic-buildnr.sh ${{ github.sha }} ${{ secrets.NIGHTLY_BUILDS }} "CICD-release"
         bash scripts/create-releasenotes.sh ${{ github.event.head_commit.id }}
+        version=$(<release-version)
+        echo "version=$version" >> $GITHUB_OUTPUT
 
     # ironically, we have to upload a file, otherwise this won't create a release with just the release notes
     - name: publish release
       if: github.event_name == 'push'
       uses: softprops/action-gh-release@v1
       with:
-        tag_name: v$(<release-version)
+        tag_name: v${{ steps.version_number.outputs.version }}
         repository: subsurface/nightly-builds
         token: ${{ secrets.NIGHTLY_BUILDS }}
         prerelease: false
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index ddc8650a6..f5a7f9cfd 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -22,6 +22,9 @@ jobs:
       if: github.event_name == 'push'
       run: |
         bash scripts/get-atomic-buildnr.sh ${{ github.sha }} ${{ secrets.NIGHTLY_BUILDS }} "CICD-release"
+        version=$(<release-version)
+        echo "version=$version" >> $GITHUB_OUTPUT
+
 
     - name: store dummy version and build number for pull request
       if: github.event_name == 'pull_request'
@@ -51,7 +54,7 @@ jobs:
       if: github.event_name == 'push'
       uses: softprops/action-gh-release@v1
       with:
-        tag_name: v$(<release-version)
+        tag_name: v${{ steps.version_number.outputs.version }}
         repository: subsurface/nightly-builds
         token: ${{ secrets.NIGHTLY_BUILDS }}
         prerelease: false