From ceee5cbc522f77d23615a18f59415725f1abfab5 Mon Sep 17 00:00:00 2001 From: FreezyLemon Date: Mon, 1 Apr 2024 20:34:24 +0200 Subject: [PATCH 1/2] Update Windows CI job - Update multiple actions to Node 20 - Switch to maintained softprops/action-gh-release - Update to VS R66 and Python 3.12 - Use Swatinem/rust-cache instead of manual caching - Remove FFmpeg/VS caching (caching doesn't save time) --- .github/workflows/windows-build.yml | 48 +++++++++-------------------- 1 file changed, 15 insertions(+), 33 deletions(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 551c1b66..66c78f1e 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -9,16 +9,18 @@ jobs: runs-on: windows-2022 env: + CARGO_INCREMENTAL: 0 + ffmpeg_ver: "6.0" ffmpeg_path: "C:/ffmpeg" - vsynth_ver: "R63" + vsynth_ver: "R66" vsynth_path: "C:/Program Files/Vapoursynth" steps: - name: Python 3 setup uses: actions/setup-python@v4 with: - python-version: '~3.10' + python-version: '~3.12' architecture: x64 - name: NASM setup @@ -27,8 +29,7 @@ jobs: version: 2.16.01 from-source: false - - if: steps.cache-ff.outputs.cache-hit != 'true' - name: FFmpeg installation + - name: FFmpeg installation run: | $tempFile = New-TemporaryFile $uri = 'https://github.com/GyanD/codexffmpeg/releases/download/VER/ffmpeg-VER-full_build-shared.7z'.Replace('VER', "$env:ffmpeg_ver") @@ -39,43 +40,24 @@ jobs: run: | echo "FFMPEG_DIR=$((Get-ChildItem -Directory "$env:ffmpeg_path").FullName)" | Out-File $env:GITHUB_ENV -Append - - name: VapourSynth cache - id: cache-vsynth - uses: actions/cache@v3 - with: - path: ${{ env.vsynth_path }} - key: vsynth-${{ env.vsynth_ver }} - - - if: steps.cache-vsynth.outputs.cache-hit != 'true' - name: VapourSynth installation + - name: VapourSynth installation run: | $tempFile = New-TemporaryFile - $uri = 'https://github.com/vapoursynth/vapoursynth/releases/download/VER/VapourSynth64-Portable-VER.7z'.Replace('VER', "$env:vsynth_ver") + $uri = 'https://github.com/vapoursynth/vapoursynth/releases/download/VER/VapourSynth64-Portable-VER.zip'.Replace('VER', "$env:vsynth_ver") Invoke-WebRequest "$uri" -OutFile "$tempFile" -TimeoutSec 10 - 7z x -y -o"$env:vsynth_path" "$tempFile" + Expand-Archive "$tempFile" "$env:vsynth_path" - - uses: actions/checkout@v3 - - - name: Package cache - uses: actions/cache@v3 - with: - path: | - ~/.cargo/git - ~/.cargo/registry - target - key: cargo-${{ hashFiles('**/Cargo.lock') }} - restore-keys: cargo- + - uses: actions/checkout@v4 + - uses: Swatinem/rust-cache@v2 - name: Av1an build - env: - CARGO_TERM_COLOR: always - run: cargo build -rv + run: cargo build --release - name: Create prerelease - uses: marvinpinto/action-automatic-releases@v1.2.1 + uses: softprops/action-gh-release@v2 with: - repo_token: ${{ github.token }} - automatic_release_tag: latest prerelease: true - draft: false + tag_name: latest files: target/release/av1an.exe + fail_on_unmatched_files: true + From e65723eb2cdebf5acb7d5df1cf4dc8868cbcee1d Mon Sep 17 00:00:00 2001 From: FreezyLemon Date: Mon, 1 Apr 2024 21:04:46 +0200 Subject: [PATCH 2/2] Update setup-python action to Node 20 --- .github/workflows/windows-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 66c78f1e..eb5863c8 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -18,7 +18,7 @@ jobs: steps: - name: Python 3 setup - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '~3.12' architecture: x64