Skip to content

Commit

Permalink
Build native mingw-w64-binutils package
Browse files Browse the repository at this point in the history
  • Loading branch information
Blackhex committed Jun 4, 2024
1 parent 3d2bf1e commit d6af5ad
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/scripts/build-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/scripts/setup-repository.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e # exit on error
set -x # echo on
set -o pipefail # fail of any command in pipeline is an error

pacman -Syuu --noconfirm
#pacman -Syuu --noconfirm

# Add WoArm64 custom repository.
REPO='[woarm64]
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/build-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
push:
branches:
- main
pull_request:
workflow_dispatch:
inputs:
msys2_packages_branch:
Expand Down
21 changes: 21 additions & 0 deletions .github/workflows/mingw-toolchain.yml
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit d6af5ad

Please sign in to comment.