From 35c8ef48a3f6b70e02dda2b4eb2d5bc383b644d5 Mon Sep 17 00:00:00 2001
From: Remy Moll <me@moll.re>
Date: Mon, 28 Apr 2025 12:41:49 +0200
Subject: [PATCH] more ci variable shenanigans

---
 .gitea/workflows/frontend_deploy-beta.yaml    | 10 +++++++---
 .gitea/workflows/frontend_deploy-release.yaml | 16 +++++++++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/.gitea/workflows/frontend_deploy-beta.yaml b/.gitea/workflows/frontend_deploy-beta.yaml
index f89f152..cd941c4 100644
--- a/.gitea/workflows/frontend_deploy-beta.yaml
+++ b/.gitea/workflows/frontend_deploy-beta.yaml
@@ -21,18 +21,22 @@ jobs:
           git fetch origin main --tags
           LATEST_TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
           # remove the 'v' prefix from the tag name
-          echo "BUILD_NAME=${LATEST_TAG//v}" >> $GITHUB_OUTPUT      
+          echo "BUILD_NAME=${LATEST_TAG//v}" >> $GITHUB_OUTPUT
+
       - name: Output the version that is being used
         run: |
           echo "Building for version ${{ steps.version.outputs.BUILD_NAME }}"
 
+    outputs:
+      build_name: ${{ steps.version.outputs.BUILD_NAME }}
+
 
   # build-android:
   #   name: Build and upload android app
   #   uses: ./.gitea/workflows/workflow_build-app-android.yaml
   #   with:
   #     build_type: release # for current testing
-  #     build_name: ${{ env.BUILD_NAME }}
+  #     build_name: ${{ needs.get-version.outputs.build_name }}
   #   secrets:
   #     ANDROID_SECRET_PROPERTIES_BASE64: ${{ secrets.ANDROID_SECRET_PROPERTIES_BASE64 }}
   #     ANDROID_GOOGLE_PLAY_JSON_BASE64: ${{ secrets.ANDROID_GOOGLE_PLAY_JSON_BASE64 }}
@@ -45,7 +49,7 @@ jobs:
     uses: ./.gitea/workflows/workflow_build-app-ios.yaml
     with:
       build_type: release # for current testing
-      build_name: ${{ steps.version.outputs.BUILD_NAME }}
+      build_name: ${{ needs.get-version.outputs.build_name }}
     secrets:
       IOS_ASC_KEY_ID: ${{ secrets.IOS_ASC_KEY_ID }}
       IOS_ASC_ISSUER_ID: ${{ secrets.IOS_ASC_ISSUER_ID }}
diff --git a/.gitea/workflows/frontend_deploy-release.yaml b/.gitea/workflows/frontend_deploy-release.yaml
index 7b8902a..c15ea7f 100644
--- a/.gitea/workflows/frontend_deploy-release.yaml
+++ b/.gitea/workflows/frontend_deploy-release.yaml
@@ -11,13 +11,23 @@ jobs:
     runs-on: macos
     steps:
       - uses: https://gitea.com/actions/checkout@v4
+
       - name: Get version from git tag
         id: version
         env: 
           REF_NAME: ${{ gitea.ref_name }}
         # remove the 'v' prefix from the tag name
         run: |
-          echo "BUILD_NAME=${REF_NAME//v}" >> $GITHUB_ENV
+          echo "BUILD_NAME=${REF_NAME//v}" >> $GITHUB_OUTPUT
+
+      - name: Output the version that is being used
+        run: |
+          echo "Building for version ${{ steps.version.outputs.BUILD_NAME }}"
+
+    outputs:
+      build_name: ${{ steps.version.outputs.BUILD_NAME }}
+
+
 
 
   build-android:
@@ -25,7 +35,7 @@ jobs:
     uses: ./.gitea/workflows/workflow_build-app-android.yaml
     with:
       build_type: release
-      build_name: ${{ env.BUILD_NAME }}
+      build_name: ${{ needs.get-version.outputs.build_name }}
     secrets:
       ANDROID_SECRET_PROPERTIES_BASE64: ${{ secrets.ANDROID_SECRET_PROPERTIES_BASE64 }}
       ANDROID_GOOGLE_PLAY_JSON_BASE64: ${{ secrets.ANDROID_GOOGLE_PLAY_JSON_BASE64 }}
@@ -38,7 +48,7 @@ jobs:
     uses: ./.gitea/workflows/workflow_build-app-ios.yaml
     with:
       build_type: release
-      build_name: ${{ env.BUILD_NAME }}
+      build_name: ${{ needs.get-version.outputs.build_name }}
     secrets:
       IOS_ASC_KEY_ID: ${{ secrets.IOS_ASC_KEY_ID }}
       IOS_ASC_ISSUER_ID: ${{ secrets.IOS_ASC_ISSUER_ID }}