Skip to content

Commit 014d782

Browse files
committed
Merge pull request #4 from dau-dev/dependabot/github_actions/actions/checkout-6
Bump actions/checkout from 4 to 6
2 parents 958df25 + 63c4b50 commit 014d782

2 files changed

Lines changed: 13 additions & 2 deletions

File tree

.github/workflows/build.yaml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
cibuildwheel:
3232
- "cp311"
3333
steps:
34-
- uses: actions/checkout@v4
34+
- uses: actions/checkout@v6
3535
with:
3636
submodules: 'true'
3737

@@ -61,6 +61,15 @@ jobs:
6161
- name: Install dependencies
6262
run: pip install cibuildwheel
6363

64+
- name: Set up MSYS2 (windows)
65+
uses: msys2/setup-msys2@v2
66+
with:
67+
msystem: UCRT64
68+
update: true
69+
path-type: inherit
70+
install: make
71+
if: ${{ runner.os == 'Windows' }}
72+
6473
- name: Python Wheel Steps (linux)
6574
run: python -m cibuildwheel --output-dir dist
6675
env:
@@ -79,8 +88,10 @@ jobs:
7988

8089
- name: Python Build Steps (windows)
8190
run: python -m cibuildwheel --output-dir dist
91+
shell: msys2 {0}
8292
env:
8393
CIBW_BUILD: "${{ matrix.cibuildwheel }}-win_amd64"
94+
CMAKE_GENERATOR: MSYS Makefiles
8495
if: ${{ matrix.os == 'windows-2022' }}
8596

8697
- name: Upload Wheel

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies-macos:
2222
brew unlink libftdi && brew link --force libftdi || true
2323

2424
dependencies-win:
25-
choco install cmake curl ninja unzip zip --no-progress -y
25+
pacman --noconfirm -S --needed mingw-w64-ucrt-x86_64-cmake mingw-w64-ucrt-x86_64-gcc mingw-w64-ucrt-x86_64-libftdi mingw-w64-ucrt-x86_64-libusb mingw-w64-ucrt-x86_64-ninja mingw-w64-ucrt-x86_64-pkgconf mingw-w64-ucrt-x86_64-zlib
2626

2727
build-openfpgaloader: ## build openFPGALoader
2828
git submodule update --init --recursive

0 commit comments

Comments
 (0)