Run build on default Windows runner, update GHA actions

Windows-on-ARM-Experiments · Feb 5, 2024 · d6d7c3e · d6d7c3e
1 parent 20478cf
commit d6d7c3e
Showing 1 changed file with 42 additions and 38 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,6 +1,10 @@
 name: Build MinGW and MSYS2 toolchain
 
 on:
+  push:
+    branches:
+      - main
+  pull_request:
   workflow_dispatch:
     inputs:
       msys2_packages_branch:
@@ -18,7 +22,7 @@ env:
 
 jobs:
   mingw-w64-cross-headers:
-    runs-on: [Windows, X64, self-hosted]
+    runs-on: windows-latest
 
     steps:
       - uses: msys2/setup-msys2@v2
@@ -42,15 +46,15 @@ jobs:
         run: makepkg --syncdeps --rmdeps --cleanbuild --noconfirm --noprogressbar --force
 
       - name: Upload mingw-w64-cross-headers
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: mingw-w64-cross-headers
           retention-days: 1
           path: ${{ github.workspace }}/MSYS2-packages/mingw-w64-cross-headers/*.pkg.tar.zst
 
   mingw-w64-cross-binutils:
     needs: [mingw-w64-cross-headers]
-    runs-on: [Windows, X64, self-hosted]
+    runs-on: windows-latest
 
     steps:
       - uses: msys2/setup-msys2@v2
@@ -70,7 +74,7 @@ jobs:
           path: ${{ github.workspace }}/MSYS2-packages
 
       - name: Download mingw-w64-cross-headers
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mingw-w64-cross-headers
 
@@ -82,15 +86,15 @@ jobs:
         run: makepkg --syncdeps --rmdeps --cleanbuild --noconfirm --noprogressbar --nocheck --force
 
       - name: Upload mingw-w64-cross-binutils
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: mingw-w64-cross-binutils
           retention-days: 1
           path: ${{ github.workspace }}/MSYS2-packages/mingw-w64-cross-binutils/*.pkg.tar.zst
 
   mingw-w64-cross-gcc-stage1:
     needs: [mingw-w64-cross-headers, mingw-w64-cross-binutils]
-    runs-on: [Windows, X64, self-hosted]
+    runs-on: windows-latest
 
     steps:
       - uses: msys2/setup-msys2@v2
@@ -110,12 +114,12 @@ jobs:
           path: ${{ github.workspace }}/MSYS2-packages
 
       - name: Download mingw-w64-cross-headers
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mingw-w64-cross-headers
 
       - name: Download mingw-w64-cross-binutils
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mingw-w64-cross-binutils
 
@@ -127,15 +131,15 @@ jobs:
         run: makepkg --syncdeps --rmdeps --cleanbuild --noconfirm --noprogressbar --force
 
       - name: Upload mingw-w64-cross-gcc-stage1
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: mingw-w64-cross-gcc-stage1
           retention-days: 1
           path: ${{ github.workspace }}/MSYS2-packages/mingw-w64-cross-gcc-stage1/*.pkg.tar.zst
 
   mingw-w64-cross-windows-default-manifest:
     needs: [mingw-w64-cross-binutils, mingw-w64-cross-gcc-stage1]
-    runs-on: [Windows, X64, self-hosted]
+    runs-on: windows-latest
 
     steps:
       - uses: msys2/setup-msys2@v2
@@ -155,12 +159,12 @@ jobs:
           path: ${{ github.workspace }}/MSYS2-packages
 
       - name: Download mingw-w64-cross-binutils
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mingw-w64-cross-binutils
 
       - name: Download mingw-w64-cross-gcc-stage1
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mingw-w64-cross-gcc-stage1
 
@@ -172,7 +176,7 @@ jobs:
         run: makepkg --syncdeps --rmdeps --cleanbuild --noconfirm --noprogressbar --force
 
       - name: Upload mingw-w64-cross-windows-default-manifest
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: mingw-w64-cross-windows-default-manifest
           retention-days: 1
@@ -185,7 +189,7 @@ jobs:
         mingw-w64-cross-binutils,
         mingw-w64-cross-gcc-stage1,
       ]
-    runs-on: [Windows, X64, self-hosted]
+    runs-on: windows-latest
 
     steps:
       - uses: msys2/setup-msys2@v2
@@ -207,17 +211,17 @@ jobs:
           path: ${{ github.workspace }}/MSYS2-packages
 
       - name: Download mingw-w64-cross-headers
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mingw-w64-cross-headers
 
       - name: Download mingw-w64-cross-binutils
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mingw-w64-cross-binutils
 
       - name: Download mingw-w64-cross-gcc-stage1
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mingw-w64-cross-gcc-stage1
 
@@ -235,7 +239,7 @@ jobs:
         run: makepkg --syncdeps --rmdeps --cleanbuild --noconfirm --noprogressbar --force
 
       - name: Upload mingw-w64-cross-crt
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: mingw-w64-cross-crt
           retention-days: 1
@@ -249,7 +253,7 @@ jobs:
         mingw-w64-cross-gcc-stage1,
         mingw-w64-cross-crt,
       ]
-    runs-on: [Windows, X64, self-hosted]
+    runs-on: windows-latest
 
     steps:
       - uses: msys2/setup-msys2@v2
@@ -269,22 +273,22 @@ jobs:
           path: ${{ github.workspace }}/MSYS2-packages
 
       - name: Download mingw-w64-cross-headers
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mingw-w64-cross-headers
 
       - name: Download mingw-w64-cross-binutils
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mingw-w64-cross-binutils
 
       - name: Download mingw-w64-cross-gcc-stage1
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mingw-w64-cross-gcc-stage1
 
       - name: Download mingw-w64-cross-crt
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mingw-w64-cross-crt
 
@@ -296,7 +300,7 @@ jobs:
         run: makepkg --syncdeps --rmdeps --cleanbuild --noconfirm --noprogressbar --force
 
       - name: Upload mingw-w64-cross-winpthreads
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: mingw-w64-cross-winpthreads
           retention-days: 1
@@ -311,7 +315,7 @@ jobs:
         mingw-w64-cross-crt,
         mingw-w64-cross-winpthreads,
       ]
-    runs-on: [Windows, X64, self-hosted]
+    runs-on: windows-latest
 
     steps:
       - uses: msys2/setup-msys2@v2
@@ -331,27 +335,27 @@ jobs:
           path: ${{ github.workspace }}/MSYS2-packages
 
       - name: Download mingw-w64-cross-headers
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mingw-w64-cross-headers
 
       - name: Download mingw-w64-cross-binutils
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mingw-w64-cross-binutils
 
       - name: Download mingw-w64-cross-windows-default-manifest
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mingw-w64-cross-windows-default-manifest
 
       - name: Download mingw-w64-cross-crt
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mingw-w64-cross-crt
 
       - name: Download mingw-w64-cross-winpthreads
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mingw-w64-cross-winpthreads
 
@@ -363,7 +367,7 @@ jobs:
         run: makepkg --syncdeps --rmdeps --cleanbuild --noconfirm --noprogressbar --force
 
       - name: Upload mingw-w64-cross-gcc
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: mingw-w64-cross-gcc
           retention-days: 1
@@ -386,37 +390,37 @@ jobs:
       - uses: msys2/setup-msys2@v2
 
       - name: Download mingw-w64-cross-headers
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mingw-w64-cross-headers
 
       - name: Download mingw-w64-cross-binutils
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mingw-w64-cross-binutils
 
       - name: Download mingw-w64-cross-gcc-stage1
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mingw-w64-cross-gcc-stage1
 
       - name: Download mingw-w64-cross-windows-default-manifest
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mingw-w64-cross-windows-default-manifest
 
       - name: Download mingw-w64-cross-crt
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mingw-w64-cross-crt
 
       - name: Download mingw-w64-cross-winpthreads
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mingw-w64-cross-winpthreads
 
       - name: Download mingw-w64-cross-gcc
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mingw-w64-cross-gcc