Github Actions:

- Move to Ubuntu 20.04 LTS for builds
- Update upload plugin to v2
- Attempt to fix intermittant failure of the tidy artifacts plugin for PRs

3 files changed, 9 insertions, 7 deletions

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 575ed9f6c..2b340dfff 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -6,7 +6,7 @@ jobs:
 
   handle_forks:
     name: Forked Repo
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     if: github.repository != 'HandBrake/HandBrake'
     steps:
     - name: Print Warning
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index bada59caf..a4e613570 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -39,13 +39,14 @@ jobs:
         make pkg.create
     
     - name: Upload Assets
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v2
       with:
         name: HandBrake-macos
         path: ./build/pkg
         
     - name: Tidy up past artifacts
       uses: kolpav/purge-artifacts-action@v1
+      if: github.repository == 'HandBrake/HandBrake'
       with:
           token: ${{ secrets.GITHUB_TOKEN }}
           expire-in: 3days
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index a24394251..5f39d490d 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
   build_mingw:
     name: CLI / LibHB
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@master
     
@@ -43,13 +43,13 @@ jobs:
         make pkg.create.zip
     
     - name: Upload HandBrakeCLI
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v2
       with:
         name: HandBrakeCLI
         path: ./build/HandBrakeCLI.exe
     
     - name: Upload LibHB
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v2
       with:
         name: LibHandBrake
         path: ./build/libhb/hb.dll
@@ -103,19 +103,20 @@ jobs:
         msbuild win\cs\build.xml /t:Nightly /p:PfxFile=$env:SigningCertificate /p:PfxPwd=${{ secrets.HandBrakeTeam_pfx_pwd }} /p:SignTimestampServer=http://time.certum.pl/
 
     - name: Upload HandBrake exe Installer
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v2
       with:
         name: HandBrake-x86_64-Win_GUI-EXE
         path: win/CS/HandBrakeWPF/bin/x64/Release/HandBrake-Nightly-x86_64-Win_GUI.exe
     
     - name: Upload HandBrake msi Installer
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v2
       with:
         name:  HandBrake-x86_64-Win_GUI-MSI
         path: win/CS/HandBrakeWPF/bin/x64/Release/HandBrake-Nightly-x86_64-Win_GUI.msi
         
     - name: Tidy up past artifacts
       uses: kolpav/purge-artifacts-action@v1
+      if: github.repository == 'HandBrake/HandBrake'
       with:
           token: ${{ secrets.GITHUB_TOKEN }}
           expire-in: 3days