Skip to content

Commit 46fafe3

Browse files
committed
Synchronize with MSYS2
This pulls in the current tip of the `msys2-3.6.1` branch, which includes a compile fix and a substantial enhancement of the CI builds by running MSYS2's tests on the built MSYS2 runtime. Signed-off-by: Johannes Schindelin <[email protected]>
2 parents bb4e8e0 + 3819160 commit 46fafe3

File tree

2 files changed

+62
-1
lines changed

2 files changed

+62
-1
lines changed

.github/workflows/build.yaml

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ name: build
22

33
on: [push, pull_request]
44

5+
permissions:
6+
contents: read
7+
58
jobs:
69
build:
710
runs-on: windows-latest
@@ -34,6 +37,7 @@ jobs:
3437
with:
3538
name: install
3639
path: _dest/
40+
3741
minimal-sdk-artifact:
3842
runs-on: windows-latest
3943
needs: [build]
@@ -107,8 +111,65 @@ jobs:
107111
with:
108112
name: git-artifacts
109113
path: git-artifacts.tar.gz
114+
110115
test-minimal-sdk:
111116
needs: [minimal-sdk-artifact]
112117
uses: git-for-windows/git-sdk-64/.github/workflows/test-ci-artifacts.yml@main
113118
with:
114119
git-artifacts-extract-location: ${{ needs.minimal-sdk-artifact.outputs.git-artifacts-extract-location }}
120+
121+
generate-msys2-tests-matrix:
122+
runs-on: ubuntu-latest
123+
outputs:
124+
matrix: ${{ steps.matrix.outputs.matrix }}
125+
steps:
126+
- id: matrix
127+
uses: msys2/msys2-tests/gha-matrix-gen@main
128+
129+
msys2-tests:
130+
needs: [build, generate-msys2-tests-matrix]
131+
strategy:
132+
fail-fast: false
133+
matrix:
134+
include: ${{ fromJson(needs.generate-msys2-tests-matrix.outputs.matrix) }}
135+
136+
name: msys2-tests ${{ matrix.msystem }}-${{ matrix.cc }}
137+
runs-on: ${{ matrix.runner }}
138+
env:
139+
CC: ${{ matrix.cc }}
140+
CXX: ${{ matrix.cxx }}
141+
FC: ${{ matrix.fc }}
142+
steps:
143+
- id: msys2
144+
uses: msys2/setup-msys2@v2
145+
with:
146+
msystem: ${{ matrix.msystem }}
147+
update: true
148+
install: ${{ matrix.packages }}
149+
150+
- name: Add staging repo
151+
shell: msys2 {0}
152+
run: |
153+
sed -i '1s|^|[staging]\nServer = https://repo.msys2.org/staging/\nSigLevel = Never\n|' /etc/pacman.conf
154+
155+
- name: Update using staging
156+
shell: pwsh
157+
run: |
158+
msys2 -c 'pacman --noconfirm -Suuy'
159+
$ErrorActionPreference = 'Stop'
160+
$PSNativeCommandUseErrorActionPreference = $true
161+
msys2 -c 'pacman --noconfirm -Suu'
162+
163+
- name: Download msys2-runtime artifact
164+
uses: actions/download-artifact@v4
165+
with:
166+
name: install
167+
path: ${{ steps.msys2.outputs.msys2-location }}
168+
169+
- name: uname -a
170+
shell: msys2 {0}
171+
run: uname -a
172+
173+
- name: Run tests
174+
uses: msys2/msys2-tests@main
175+

newlib/libc/include/sys/unistd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ int setpgrp (void);
215215
#if defined(__CYGWIN__) && __BSD_VISIBLE
216216
/* Stub for Linux libbsd compatibility. */
217217
#define initsetproctitle(c, a, e) setproctitle_init((c), (a), (e))
218-
static inline void setproctitle_init (int _c, char *_a[], char *_e[]) {}
218+
static __inline void setproctitle_init (int _c, char *_a[], char *_e[]) {}
219219

220220
void setproctitle (const char *, ...)
221221
_ATTRIBUTE ((__format__ (__printf__, 1, 2)));

0 commit comments

Comments
 (0)