Fix mingw32 github actions
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fd7e108..e7b89d9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -201,7 +201,7 @@ jobs:
exit $?
build:
- name: Build & test with MingW32
+ name: Build & test with Cygwin
runs-on: windows-latest
strategy:
@@ -218,7 +218,7 @@ jobs:
uses: egor-tensin/setup-cygwin@v3
with:
platform: x64
- packages: wget make dejagnu automake autoconf libtool texinfo dos2unix unzip
+ packages: wget gcc-core make dejagnu automake autoconf libtool texinfo dos2unix unzip
- run: |
set -x
@@ -226,20 +226,20 @@ jobs:
wget https://rl.gl/cli/rlgl-windows-amd64.zip
unzip rlgl-windows-amd64.zip
autoreconf -f -v -i
- CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ ./configure
- make
+ ./configure
+ make -j 4
TERM=none DEJAGNU=$(pwd)/.ci/site.exp BOARDSDIR=$(pwd)/.ci make check || true
./rlgl/rlgl.exe l --key=0LIBFFI-0LIBFFI-0LIBFFI-0LIBFFI https://rl.gl
./rlgl/rlgl.exe e \
-l project=libffi \
-l sha=${GITHUB_SHA:0:7} \
- -l CC=i686-w64-mingw32-gcc \
+ -l CC=gcc \
-l host=x86_64-pc-cygwin \
--policy=https://github.com/libffi/rlgl-policy.git $(find . -name libffi.log)
shell: C:\tools\cygwin\bin\bash.exe --login --norc -eo pipefail -o igncr '{0}'
build:
- name: Build & test with Cygwin
+ name: Build & test with MingW32
runs-on: windows-latest
strategy:
@@ -256,7 +256,7 @@ jobs:
uses: egor-tensin/setup-cygwin@v3
with:
platform: x64
- packages: wget gcc-core make dejagnu automake autoconf libtool texinfo dos2unix unzip
+ packages: wget make dejagnu automake autoconf libtool texinfo dos2unix unzip
- run: |
set -x
@@ -264,14 +264,14 @@ jobs:
wget https://rl.gl/cli/rlgl-windows-amd64.zip
unzip rlgl-windows-amd64.zip
autoreconf -f -v -i
- ./configure
- make -j 4
+ CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ ./configure
+ make
TERM=none DEJAGNU=$(pwd)/.ci/site.exp BOARDSDIR=$(pwd)/.ci make check || true
./rlgl/rlgl.exe l --key=0LIBFFI-0LIBFFI-0LIBFFI-0LIBFFI https://rl.gl
./rlgl/rlgl.exe e \
-l project=libffi \
-l sha=${GITHUB_SHA:0:7} \
- -l CC=gcc \
+ -l CC=i686-w64-mingw32-gcc \
-l host=x86_64-pc-cygwin \
--policy=https://github.com/libffi/rlgl-policy.git $(find . -name libffi.log)
shell: C:\tools\cygwin\bin\bash.exe --login --norc -eo pipefail -o igncr '{0}'