From d6d7c3ef79395a0a2537e88d78b4068a62693749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Radek=20Barto=C5=88?= Date: Sun, 4 Feb 2024 02:11:02 +0100 Subject: [PATCH] Run build on default Windows runner, update GHA actions --- .github/workflows/main.yml | 80 ++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8ce1356..c1ac467 100644 --- 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,7 +46,7 @@ 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 @@ -50,7 +54,7 @@ jobs: 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,7 +86,7 @@ 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 @@ -90,7 +94,7 @@ jobs: 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,7 +131,7 @@ 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 @@ -135,7 +139,7 @@ jobs: 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