From 78f58d1b07f7ea983ae64eb7c736a75666556e7a Mon Sep 17 00:00:00 2001 From: Amrsatrio Date: Fri, 28 Jun 2024 18:13:29 +0700 Subject: [PATCH 1/5] Build: Update deprecated set-output syntax --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f7f597334..5ed78d29d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -65,8 +65,8 @@ jobs: id: vars shell: bash run: | - echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" - echo "::set-output name=sha_short::$(git rev-parse --short HEAD)" + echo "branch=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_ENV + echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_ENV - name: Enable SimpleWindowSwitcher support for newer Windows SDKs shell: cmd @@ -146,7 +146,7 @@ jobs: working-directory: build/Release if: github.ref == 'refs/heads/master' && github.event.inputs.ref == '' run: | - echo "::set-output name=data::$(./ep_generate_release_name.exe)" + echo "data=$(./ep_generate_release_name.exe)" >> $GITHUB_ENV id: release_name - name: Generate release notes @@ -158,7 +158,7 @@ jobs: MY_STRING="${MY_STRING//'%'/'%25'}" MY_STRING="${MY_STRING//$'\n'/'%0A'}" MY_STRING="${MY_STRING//$'\r'/'%0D'}" - echo "::set-output name=data::$MY_STRING" + echo "data=$MY_STRING" >> $GITHUB_ENV id: release_description - name: Create/update release (valinet) From a94fcbc0b64ff2c65b1eaf4a7760bb6d0a282585 Mon Sep 17 00:00:00 2001 From: Amrsatrio Date: Fri, 28 Jun 2024 18:35:44 +0700 Subject: [PATCH 2/5] Build: Update deprecated actions --- .github/workflows/build.yml | 40 ++++++++++--------------------------- 1 file changed, 11 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5ed78d29d..018b0324f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,20 +46,20 @@ jobs: echo "build_dir: ${{ github.event.inputs.build_dir }}" - name: Checkout latest build and submodules - uses: actions/checkout@v2 + uses: actions/checkout@v4 if: github.event.inputs.ref == '' with: submodules: recursive - name: Checkout specific build and submodules - uses: actions/checkout@v2 + uses: actions/checkout@v4 if: github.event.inputs.ref != '' with: ref: ${{ github.event.inputs.ref }} submodules: recursive - name: Add MSBuild to PATH - uses: microsoft/setup-msbuild@v1.0.2 + uses: microsoft/setup-msbuild@v2 - name: Declare some variables id: vars @@ -80,7 +80,7 @@ jobs: exit /b 0 - name: Setup NuGet - uses: nuget/setup-nuget@v1 + uses: nuget/setup-nuget@v2 - name: Restore NuGet packages run: | @@ -135,7 +135,7 @@ jobs: exit /b 0 - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ep_bin_multi_${{ steps.vars.outputs.sha_short }}_${{ steps.vars.outputs.branch }} path: | @@ -162,7 +162,7 @@ jobs: id: release_description - name: Create/update release (valinet) - uses: actions/create-release@v1 + uses: softprops/action-gh-release@v2 if: github.repository_owner == 'valinet' && github.ref == 'refs/heads/master' && github.event.inputs.ref == '' id: create_release with: @@ -171,22 +171,13 @@ jobs: 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 }} - env: - GITHUB_TOKEN: ${{ secrets.PAT }} - - - name: Upload setup (valinet) - uses: actions/upload-release-asset@v1 - if: github.repository_owner == 'valinet' && github.ref == 'refs/heads/master' && github.event.inputs.ref == '' - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./build/Release/ep_setup.exe - asset_name: ep_setup.exe - asset_content_type: application/x-msdownload + files: | + ./build/Release/ep_setup.exe env: GITHUB_TOKEN: ${{ secrets.PAT }} - name: Create/update release (forks) - uses: actions/create-release@v1 + uses: softprops/action-gh-release@v2 if: github.repository_owner != 'valinet' && github.ref == 'refs/heads/master' && github.event.inputs.ref == '' id: create_release_fork with: @@ -195,16 +186,7 @@ jobs: 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 }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Upload setup (forks) - uses: actions/upload-release-asset@v1 - if: github.repository_owner != 'valinet' && github.ref == 'refs/heads/master' && github.event.inputs.ref == '' - with: - upload_url: ${{ steps.create_release_fork.outputs.upload_url }} - asset_path: ./build/Release/ep_setup.exe - asset_name: ep_setup.exe - asset_content_type: application/x-msdownload + files: | + ./build/Release/ep_setup.exe env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 0711a7bd873f79d091cc8cc89219c70a1954b914 Mon Sep 17 00:00:00 2001 From: Amrsatrio Date: Fri, 28 Jun 2024 18:53:27 +0700 Subject: [PATCH 3/5] Build: Fix mistakes --- .github/workflows/build.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 018b0324f..58c79f632 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -137,7 +137,7 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: ep_bin_multi_${{ steps.vars.outputs.sha_short }}_${{ steps.vars.outputs.branch }} + name: ep_bin_multi_${{ env.sha_short }}_${{ env.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 "data=$(./ep_generate_release_name.exe)" >> $GITHUB_ENV + echo "release_name=$(./ep_generate_release_name.exe)" >> $GITHUB_ENV id: release_name - name: Generate release notes @@ -154,11 +154,11 @@ jobs: working-directory: build/Release if: github.ref == 'refs/heads/master' && github.event.inputs.ref == '' run: | - MY_STRING=$(./ep_generate_release_description.exe ${{ steps.vars.outputs.sha_short }} ${{ steps.vars.outputs.branch }} ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) + 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 "data=$MY_STRING" >> $GITHUB_ENV + echo "release_description=$MY_STRING" >> $GITHUB_ENV id: release_description - name: Create/update release (valinet) @@ -168,9 +168,9 @@ jobs: with: draft: false prerelease: ${{ !startsWith(github.event.head_commit.message, 'rel_') }} - 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 }} + name: ${{ env.release_name }} + tag_name: ${{ env.release_name }}_${{ env.sha_short }} + body: ${{ env.release_description }} files: | ./build/Release/ep_setup.exe env: @@ -183,9 +183,9 @@ jobs: with: draft: false prerelease: ${{ !startsWith(github.event.head_commit.message, 'rel_') }} - 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 }} + name: ${{ env.release_name }} + tag_name: ${{ env.release_name }}_${{ env.sha_short }} + body: ${{ env.release_description }} files: | ./build/Release/ep_setup.exe env: From e291b744caa179f0eccafd7fca4e582f5c429e15 Mon Sep 17 00:00:00 2001 From: Amrsatrio Date: Fri, 28 Jun 2024 19:13:33 +0700 Subject: [PATCH 4/5] 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 58c79f632..d3af3bd19 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<> $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: From 68d83599704d61ccae2045524a605ab80fec28b3 Mon Sep 17 00:00:00 2001 From: Amrsatrio Date: Fri, 28 Jun 2024 19:20:13 +0700 Subject: [PATCH 5/5] Build: Fix mistakes ^3 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d3af3bd19..bd40911cb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -166,7 +166,7 @@ jobs: with: draft: false prerelease: ${{ !startsWith(github.event.head_commit.message, 'rel_') }} - release_name: ${{ steps.release_name.outputs.data }} + 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: | @@ -181,7 +181,7 @@ jobs: with: draft: false prerelease: ${{ !startsWith(github.event.head_commit.message, 'rel_') }} - release_name: ${{ steps.release_name.outputs.data }} + 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: |