diff --git a/.github/workflows/release_linux.yml b/.github/workflows/release_linux.yml index 61d08a28..ec8df9e0 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 @@ -59,23 +59,6 @@ jobs: mv dist/hydrus_client "dist/Hydrus Network" tar --zstd -cvf Ubuntu-Extract.tar.zst -C dist "Hydrus Network" - - name: Upload a Build Artifact - uses: actions/upload-artifact@v3 - with: - name: Ubuntu-Extract - path: Ubuntu-Extract.tar.zst - if-no-files-found: error - retention-days: 2 - - create-release: - name: Upload to Release - runs-on: ubuntu-20.04 - needs: [build-ubuntu] - steps: - - - name: Get All Artifacts - uses: actions/download-artifact@v3 - - name: Extract Version Metadata id: meta run: | @@ -84,8 +67,7 @@ jobs: - name: Rename Files run: | - mkdir ubuntu - mv Ubuntu-Extract/Ubuntu-Extract.tar.zst Hydrus.Network.${{ env.version_short }}.-.Linux.-.Executable.tar.zst + mv Ubuntu-Extract.tar.zst Hydrus.Network.${{ env.version_short }}.-.Linux.-.Executable.tar.zst - name: Upload Files uses: softprops/action-gh-release@v1 diff --git a/.github/workflows/release_macos.yml b/.github/workflows/release_macos.yml index c9ad8092..f3cd7233 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,9 @@ 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: | + cd $GITHUB_WORKSPACE + curl -L -o ffmpeg-macos.7z https://evermeet.cx/ffmpeg/getrelease/ffmpeg/7z - name: Process ffmpeg run: | @@ -66,23 +63,6 @@ jobs: hdiutil create "$temp_dmg" -ov -volname "HydrusNetwork" -fs HFS+ -format UDZO -srcfolder "$GITHUB_WORKSPACE/build/$(head -n 1 triple.txt)/release" mv "$temp_dmg" HydrusNetwork.dmg - - name: Upload a Build Artifact - uses: actions/upload-artifact@v3 - with: - name: MacOS-DMG - path: HydrusNetwork.dmg - if-no-files-found: error - retention-days: 2 - - create-release: - name: Upload to Release - runs-on: ubuntu-20.04 - needs: [build-macos] - steps: - - - name: Get Artifacts - uses: actions/download-artifact@v3 - - name: Extract Version Metadata id: meta run: | @@ -91,7 +71,7 @@ jobs: - name: Rename Files run: | - mv MacOS-DMG/HydrusNetwork.dmg Hydrus.Network.${{ env.version_short }}.-.macOS.-.App.dmg + mv HydrusNetwork.dmg Hydrus.Network.${{ env.version_short }}.-.macOS.-.App.dmg - name: Upload Files uses: softprops/action-gh-release@v1 diff --git a/.github/workflows/release_win.yml b/.github/workflows/release_win.yml index adc7fdcd..af223b6c 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" -Headers @{ "User-Agent" = "LetMeIn" } - 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: | @@ -74,45 +64,19 @@ jobs: name: Compress Client run: | cd .\dist - 7z.exe a -tzip -mm=Deflate -mx=5 ..\Windows-Extract.zip 'Hydrus Network' + 7z.exe a -tzip -mm=Deflate -mx=5 Windows-Extract.zip 'Hydrus Network' cd .. - - name: Upload a Build Artifact - uses: actions/upload-artifact@v3 - with: - name: Windows-Install - path: dist\HydrusInstaller.exe - if-no-files-found: error - retention-days: 2 - - - name: Upload a Build Artifact - uses: actions/upload-artifact@v3 - with: - name: Windows-Extract - path: Windows-Extract.zip - if-no-files-found: error - retention-days: 2 - - create-release: - name: Upload to Release - runs-on: ubuntu-20.04 - needs: [build-windows] - steps: - - - name: Get Artifacts - uses: actions/download-artifact@v3 - - name: Extract Version Metadata id: meta run: | - echo "version=${GITHUB_REF##*/}" >> $GITHUB_ENV - echo "version_short=${GITHUB_REF##*/v}" >> $GITHUB_ENV - - + $vs = "${{ github.ref_name }}".Substring(1) + echo "version_short=$vs" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append + - name: Rename Files run: | - mkdir windows - mv Windows-Install/HydrusInstaller.exe Hydrus.Network.${{ env.version_short }}.-.Windows.-.Installer.exe - mv Windows-Extract/Windows-Extract.zip Hydrus.Network.${{ env.version_short }}.-.Windows.-.Extract.only.zip + move dist\HydrusInstaller.exe Hydrus.Network.${{ env.version_short }}.-.Windows.-.Installer.exe + move dist\Windows-Extract.zip Hydrus.Network.${{ env.version_short }}.-.Windows.-.Extract.only.zip - name: Upload Files uses: softprops/action-gh-release@v1