From 041b48f835dbe2f584481b5aca51b9918c8e903b Mon Sep 17 00:00:00 2001 From: Hydrus Network Developer Date: Mon, 19 Feb 2024 13:40:45 -0600 Subject: [PATCH] Next Attempt Hopefully fixes the Windows version environment variable gubbins with Powershell syntax, and replaces old Node 16 commands with newer versions or curl/Invoke-BBQ The Node16 action-gh-release should be updated fairly soon --- .github/workflows/release_linux.yml | 4 ++-- .github/workflows/release_macos.yml | 11 +++-------- .github/workflows/release_win.yml | 23 +++++++---------------- 3 files changed, 12 insertions(+), 26 deletions(-) diff --git a/.github/workflows/release_linux.yml b/.github/workflows/release_linux.yml index 606b8b995..ec8df9e06 100644 --- a/.github/workflows/release_linux.yml +++ b/.github/workflows/release_linux.yml @@ -10,12 +10,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: hydrus - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.10' architecture: x64 diff --git a/.github/workflows/release_macos.yml b/.github/workflows/release_macos.yml index 87746ff38..e3668b746 100644 --- a/.github/workflows/release_macos.yml +++ b/.github/workflows/release_macos.yml @@ -10,10 +10,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.10' - @@ -28,12 +28,7 @@ jobs: run: python3 -m pip install pyoxidizer==0.24.0 - name: Download ffmpeg - uses: carlosperate/download-file-action@v2 - id: download_ffmpeg - with: - file-url: 'https://evermeet.cx/ffmpeg/getrelease/ffmpeg/7z' - file-name: 'ffmpeg-macos.7z' - location: '.' + run: curl -o ffmpeg-macos.7z https://evermeet.cx/ffmpeg/getrelease/ffmpeg/7z - name: Process ffmpeg run: | diff --git a/.github/workflows/release_win.yml b/.github/workflows/release_win.yml index 790b6e128..18a8d80f3 100644 --- a/.github/workflows/release_win.yml +++ b/.github/workflows/release_win.yml @@ -10,12 +10,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: hydrus - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.10' architecture: x64 @@ -28,12 +28,7 @@ jobs: working-directory: hydrus - name: Download mpv-dev - uses: carlosperate/download-file-action@v2 - id: download_mpv - with: - file-url: 'https://sourceforge.net/projects/mpv-player-windows/files/libmpv/mpv-dev-x86_64-20230212-git-a40958c.7z' - file-name: 'mpv-dev-x86_64.7z' - location: '.' + run: Invoke-WebRequest -Uri "https://sourceforge.net/projects/mpv-player-windows/files/libmpv/mpv-dev-x86_64-20230212-git-a40958c.7z" -OutFile "mpv-dev-x86_64.7z" - name: Process mpv-dev run: | @@ -41,12 +36,7 @@ jobs: move mpv\libmpv-2.dll hydrus\mpv-2.dll - name: Download ffmpeg - uses: carlosperate/download-file-action@v2 - id: download_ffmpeg - with: - file-url: 'https://www.gyan.dev/ffmpeg/builds/ffmpeg-release-full.7z' - file-name: 'ffmpeg-release-full.7z' - location: '.' + run: Invoke-WebRequest -Uri "https://www.gyan.dev/ffmpeg/builds/ffmpeg-release-full.7z" -OutFile "ffmpeg-release-full.7z" - name: Process ffmpeg run: | @@ -80,8 +70,9 @@ jobs: name: Extract Version Metadata id: meta run: | - echo "version=${{ github.ref_name }}" >> %GITHUB_ENV% - echo "version_short=%version:~1%" >> %GITHUB_ENV% + echo "version=${{ github.ref_name }}" >> $env:GITHUB_ENV + $vs = "${{ env.version }}".Substring(1) + echo "version_short=$vs" >> $env:GITHUB_ENV - name: Rename Files run: |