From 57eac8e40dccadff23ec9dc5892982bf2c90a183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radek=20Barto=C5=88?= <radek.barton@microsoft.com>
Date: Wed, 29 May 2024 16:22:33 +0200
Subject: [PATCH] Build native mingw-w64-binutils package

---
 .github/scripts/build-package.sh      |  2 +-
 .github/workflows/build-package.yml   | 11 ++++++++---
 .github/workflows/main.yml            |  1 -
 .github/workflows/mingw-toolchain.yml | 21 +++++++++++++++++++++
 4 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 .github/workflows/mingw-toolchain.yml

diff --git a/.github/scripts/build-package.sh b/.github/scripts/build-package.sh
index c550b41..993fd2f 100755
--- a/.github/scripts/build-package.sh
+++ b/.github/scripts/build-package.sh
@@ -15,7 +15,7 @@ ARGUMENTS="--syncdeps \
     --force"
 
 if [[ "$PACKAGE_REPOSITORY" == *MINGW* ]]; then
-    MINGW_ARCH=mingw64 makepkg-mingw $ARGUMENTS --skippgpcheck
+    makepkg-mingw $ARGUMENTS
 else
     makepkg $ARGUMENTS
 fi
diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml
index aa5b8ab..f05e4e7 100644
--- a/.github/workflows/build-package.yml
+++ b/.github/workflows/build-package.yml
@@ -21,6 +21,10 @@ on:
         description: "MSYS2 packages branch to build from"
         type: string
         default: "woarm64"
+      runs_on_arm64:
+        description: "Whether Arm64 runner is required"
+        type: boolean
+        default: false
 
 defaults:
   run:
@@ -31,13 +35,14 @@ env:
 
 jobs:
   build:
-    runs-on: windows-latest
+    runs-on: [Windows, ARM64, Blackhex]
 
     steps:
       - uses: msys2/setup-msys2@v2
         with:
-          msystem: MSYS
-          update: true
+          msystem: ${{ contains(inputs.packages_repository, 'MINGW') && 'MINGW64' || 'MSYS'}}
+          cache: false
+          update: false
 
       - name: Checkout repository
         uses: actions/checkout@v4
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 420cbaf..e9a8783 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-  pull_request:
   workflow_dispatch:
     inputs:
       msys2_packages_branch:
diff --git a/.github/workflows/mingw-toolchain.yml b/.github/workflows/mingw-toolchain.yml
new file mode 100644
index 0000000..df289aa
--- /dev/null
+++ b/.github/workflows/mingw-toolchain.yml
@@ -0,0 +1,21 @@
+name: Build MinGW toolchain
+
+on:
+  pull_request:
+  workflow_dispatch:
+    inputs:
+      mingw_packages_branch:
+        description: "MINGW-packages branch to build"
+        type: string
+        required: false
+        default: "woarm64"
+
+jobs:
+  mingw-w64-binutils:
+    uses: ./.github/workflows/build-package.yml
+    with:
+      package_name: mingw-w64-binutils
+      packages_repository: Windows-on-ARM-Experiments/MINGW-packages
+      packages_branch: ${{ github.event.inputs.mingw_packages_branch || 'woarm64' }}
+      dependencies: mingw-w64-cross-gcc
+      runs_on_arm64: true