From e291b744caa179f0eccafd7fca4e582f5c429e15 Mon Sep 17 00:00:00 2001
From: Amrsatrio <satrionareswara@yahoo.com>
Date: Fri, 28 Jun 2024 19:13:33 +0700
Subject: [PATCH] Build: Fix mistakes ^2

---
 .github/workflows/build.yml | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 58c79f6..d3af3bd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -65,8 +65,8 @@ jobs:
       id: vars
       shell: bash
       run: |
-        echo "branch=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_ENV
-        echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+        echo "branch=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_OUTPUT
+        echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
       
     - name: Enable SimpleWindowSwitcher support for newer Windows SDKs
       shell: cmd
@@ -137,7 +137,7 @@ jobs:
     - name: Upload artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: ep_bin_multi_${{ env.sha_short }}_${{ env.branch }}
+        name: ep_bin_multi_${{ steps.vars.outputs.sha_short }}_${{ steps.vars.outputs.branch }}
         path: |
           build/Release/
 
@@ -146,7 +146,7 @@ jobs:
       working-directory: build/Release
       if: github.ref == 'refs/heads/master' && github.event.inputs.ref == ''
       run: |
-        echo "release_name=$(./ep_generate_release_name.exe)" >> $GITHUB_ENV
+        echo "data=$(./ep_generate_release_name.exe)" >> $GITHUB_OUTPUT
       id: release_name
       
     - name: Generate release notes
@@ -154,11 +154,9 @@ jobs:
       working-directory: build/Release
       if: github.ref == 'refs/heads/master' && github.event.inputs.ref == ''
       run: |
-        MY_STRING=$(./ep_generate_release_description.exe ${{ env.sha_short }} ${{ env.branch }} ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
-        MY_STRING="${MY_STRING//'%'/'%25'}"
-        MY_STRING="${MY_STRING//$'\n'/'%0A'}"
-        MY_STRING="${MY_STRING//$'\r'/'%0D'}"
-        echo "release_description=$MY_STRING" >> $GITHUB_ENV
+        echo "data<<EP_RELEASE_DESCRIPTION_DELIM" >> $GITHUB_OUTPUT
+        echo "$(./ep_generate_release_description.exe ${{ steps.vars.outputs.sha_short }} ${{ steps.vars.outputs.branch }} ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})" >> $GITHUB_OUTPUT
+        echo "EP_RELEASE_DESCRIPTION_DELIM" >> $GITHUB_OUTPUT
       id: release_description
       
     - name: Create/update release (valinet)
@@ -168,9 +166,9 @@ jobs:
       with:
         draft: false
         prerelease: ${{ !startsWith(github.event.head_commit.message, 'rel_') }}
-        name: ${{ env.release_name }}
-        tag_name: ${{ env.release_name }}_${{ env.sha_short }}
-        body: ${{ env.release_description }}
+        release_name: ${{ steps.release_name.outputs.data }}
+        tag_name: ${{ steps.release_name.outputs.data }}_${{ steps.vars.outputs.sha_short }}
+        body: ${{ steps.release_description.outputs.data }}
         files: |
           ./build/Release/ep_setup.exe
       env:
@@ -183,9 +181,9 @@ jobs:
       with:
         draft: false
         prerelease: ${{ !startsWith(github.event.head_commit.message, 'rel_') }}
-        name: ${{ env.release_name }}
-        tag_name: ${{ env.release_name }}_${{ env.sha_short }}
-        body: ${{ env.release_description }}
+        release_name: ${{ steps.release_name.outputs.data }}
+        tag_name: ${{ steps.release_name.outputs.data }}_${{ steps.vars.outputs.sha_short }}
+        body: ${{ steps.release_description.outputs.data }}
         files: |
           ./build/Release/ep_setup.exe
       env: