summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorAnthony Green <green@moxielogic.com>2022-09-14 23:02:32 -0400
committerAnthony Green <green@moxielogic.com>2022-09-14 23:02:32 -0400
commitce5b2208121667236874181360ca91aaa285b528 (patch)
tree20ce140adf7ee7bc57b08b17f4837df33f9b970b /.github
parent317c9b6a13d3414c510b27bdc7ce57be56399df5 (diff)
downloadlibffi-ce5b2208121667236874181360ca91aaa285b528.tar.gz
Fix mingw32 github actions
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/build.yml20
1 files changed, 10 insertions, 10 deletions
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}'