From c09a3ce79385a0197ac140858cb69d5c35de4ad4 Mon Sep 17 00:00:00 2001 From: Ansgar Wehrhahn Date: Wed, 2 Dec 2020 14:38:55 +0100 Subject: [PATCH] Update make.yml --- .github/workflows/make.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/make.yml b/.github/workflows/make.yml index 70feb1a..dbd69d8 100644 --- a/.github/workflows/make.yml +++ b/.github/workflows/make.yml @@ -50,8 +50,6 @@ jobs: - name: windows-gfortran runs_on: ubuntu-latest packages: gfortran mingw-w64 mingw-w64-tools mingw-w64-common gfortran-mingw-w64 gfortran-mingw-w64-x86-64 gcc-mingw-w64 gcc-mingw-w64-x86-64 g++-mingw-w64 g++-mingw-w64-x86-64 - target: win64 - ldflags: -L$(x86_64-w64-mingw32-gfortran --print-file-name=) cxx: x86_64-w64-mingw32-gcc f77: x86_64-w64-mingw32-gfortran config_flags: --build=x86_64-pc-linux-gnu --host=x86_64-w64-mingw32 @@ -79,26 +77,19 @@ jobs: run: rm Makefile.am && mv Makefile_f2c.am Makefile.am - name: Echo site details - env: - CXX: ${{ matrix.cxx }} - F77: ${{ matrix.f77 }} - LDFLAGS: ${{ matrix.ldflags }} - run: echo $LDFLAGS -L$(x86_64-w64-mingw32-gfortran --print-file-name=) + if: matrix.name == 'windows-gfortran' + run: export LDFLAGS=-L$(x86_64-w64-mingw32-gfortran --print-file-name=) - name: Run Bootstrap and Configure env: CXX: ${{ matrix.cxx }} F77: ${{ matrix.f77 }} - LDFLAGS: ${{ matrix.ldflags }} - shell: bash run: ./bootstrap && ./configure --prefix=$PWD ${{ matrix.config_flags }} - name: Install - # Execute the build. You can specify a specific target with "--target " env: CXX: ${{ matrix.cxx }} F77: ${{ matrix.f77 }} - LDFLAGS: ${{ matrix.ldflags }} run: make install - name: Zip data # This would actually build your project, using zip for an example artifact