Skip to content

Commit 7eaf5b6

Browse files
authored
Merge pull request #61 from ngtcp2/update-gha
GHA: Update and run tests on i686 wine
2 parents b9abf0e + 105936c commit 7eaf5b6

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ jobs:
1515

1616
steps:
1717
- uses: actions/checkout@v4
18+
with:
19+
submodules: recursive
1820
- name: Linux setup
1921
if: runner.os == 'Linux'
2022
run: |
@@ -71,7 +73,6 @@ jobs:
7173
echo 'CXXFLAGS='"$CXXFLAGS" >> $GITHUB_ENV
7274
- name: Configure autotools
7375
run: |
74-
git submodule update --init --depth 1
7576
autoreconf -i && ./configure --disable-dependency-tracking
7677
- name: Build sfparse with distcheck
7778
run: |
@@ -89,9 +90,14 @@ jobs:
8990

9091
steps:
9192
- uses: actions/checkout@v4
92-
- name: Linux setup
93+
with:
94+
submodules: recursive
95+
- name: Prepare for i386
96+
if: matrix.host == 'i686-w64-mingw32'
9397
run: |
9498
sudo dpkg --add-architecture i386
99+
- name: Linux setup
100+
run: |
95101
sudo apt-get update
96102
sudo apt-get install \
97103
gcc-mingw-w64 \
@@ -103,7 +109,6 @@ jobs:
103109
wine
104110
- name: Configure autotools
105111
run: |
106-
git submodule update --init --depth 1
107112
autoreconf -i && \
108113
./configure --disable-dependency-tracking --enable-werror \
109114
--host="$HOST" LIBS="-pthread"
@@ -112,7 +117,6 @@ jobs:
112117
make -j$(nproc)
113118
make -j$(nproc) check TESTS=""
114119
- name: Run tests
115-
if: matrix.host == 'x86_64-w64-mingw32'
116120
run: |
117-
export WINEPATH=/usr/x86_64-w64-mingw32/lib
121+
export WINEPATH="/usr/${{ matrix.host }}/lib;$(winepath -w /usr/lib/x86_64-linux-gnu/wine/x86_64-windows)"
118122
wine test.exe

0 commit comments

Comments
 (0)