diff options
author | Anthony Green <green@moxielogic.com> | 2022-09-27 17:39:44 -0400 |
---|---|---|
committer | Anthony Green <green@moxielogic.com> | 2022-09-27 17:39:44 -0400 |
commit | 9785eee066782d7575023f94b64402963b55aa8c (patch) | |
tree | 55260a9dd229b7e8498b14136c079cc9faf7fe7c | |
parent | 1421717effc7b5052e3c26e2b715a83a8a61355c (diff) | |
download | libffi-9785eee066782d7575023f94b64402963b55aa8c.tar.gz |
32- and 64-bit Windows
-rw-r--r-- | .github/workflows/build.yml | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4fb6873..07ef921 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -317,13 +317,17 @@ jobs: - run: ${{ matrix.compilers }} ./.ci/build.sh build-msvc: - name: Windows 64-bit Visual C++ + name: Windows ${{ matrix.width }}-bit Visual C++ runs-on: windows-latest strategy: fail-fast: false matrix: - platform: [windows-latest] + include: + - host: i686-pc-cygwin + width: 32 + - host: x86_64-pc-cygwin + width: 64 steps: - run: git config --global core.autocrlf input @@ -343,16 +347,16 @@ jobs: wget https://rl.gl/cli/rlgl-windows-amd64.zip unzip rlgl-windows-amd64.zip autoreconf -f -v -i - ./configure CC="$(pwd)/msvcc.sh -m64" CXX="$(pwd)/msvcc.sh -m64" LD='link' CPP='cl -nologo -EP' CXXCPP='cl -nologo -EP' CPPFLAGS='-DFFI_BUILDING_DLL' AR='$(pwd)/.ci/ar-lib lib' NM='dumpbin -symbols' STRIP=':' --build=$BUILD --host=$HOST $DEBUG_ARG $SHARED_ARG || cat */config.log + ./configure --host=${{ matrix.host }} CC="$(pwd)/msvcc.sh -m${{ matrix.width }}" CXX="$(pwd)/msvcc.sh -m${{ matrix.width }}" LD='link' CPP='cl -nologo -EP' CXXCPP='cl -nologo -EP' CPPFLAGS='-DFFI_BUILDING_DLL' AR='$(pwd)/.ci/ar-lib lib' NM='dumpbin -symbols' STRIP=':' $DEBUG_ARG $SHARED_ARG || cat */config.log make - cp $(find . -name 'libffi-?.dll') x86_64-pc-cygwin/testsuite/ + cp $(find . -name 'libffi-?.dll') ${{ matrix.host }}/testsuite/ TERM=none DEJAGNU=$(pwd)/.ci/site.exp BOARDSDIR=$(pwd)/.ci GCC_COLORS= 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=msvcc.sh \ - -l host=x86_64-pc-cygwin \ + -l host=${{ matrix.host }} \ --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}' |