From b5f3b80b2527ffa1befdb7bd3b91e4c7ec9c873d Mon Sep 17 00:00:00 2001 From: Charlie Vanaret Date: Sun, 17 Nov 2024 19:57:44 +0100 Subject: [PATCH] [CI] Install gfortran in macOS build + deleted Windows build --- .github/workflows/build-macos.yml | 3 ++ .github/workflows/build-windows.yml | 46 ----------------------------- 2 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 .github/workflows/build-windows.yml diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 4616ec5d..8e4b934b 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -36,6 +36,9 @@ jobs: # FortranCInterface_VERIFY fails on macOS, but it's not actually needed for the current build run: sed -i".backup" 's/FortranCInterface_VERIFY(CXX)/# FortranCInterface_VERIFY(CXX)/g' ${{github.workspace}}/CMakeLists.txt + - name: Install gfortran + run: brew install --cask gfortran + - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml deleted file mode 100644 index f1e261b6..00000000 --- a/.github/workflows/build-windows.yml +++ /dev/null @@ -1,46 +0,0 @@ -# This starter workflow is for a CMake project running on a single platform. There is a different starter workflow if you need cross-platform coverage. -# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-multi-platform.yml -name: Build on Windows - -on: - push: - branches: [ "main" ] - paths-ignore: - - '*.md' - - 'LICENSE' - - '*.cff' - - '*.options' - - 'uno_ampl-completion.bash' - pull_request: - branches: [ "main" ] - -env: - # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) - BUILD_TYPE: Release - -jobs: - build: - # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac. - # You can convert this to a matrix build if you need cross-platform coverage. - # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [windows-latest] - architecture: [x86, x64] - - steps: - - uses: actions/checkout@v4 - - - name: Clean up FortranCInterface_VERIFY - # FortranCInterface_VERIFY fails on macOS, but it's not actually needed for the current build - run: sed -i 's/FortranCInterface_VERIFY(CXX)/# FortranCInterface_VERIFY(CXX)/g' ${{github.workspace}}/CMakeLists.txt - - - name: Configure CMake - # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. - # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type - run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} - - - name: Build - # Build your program with the given configuration - run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}