Remove multiple builds for macOS and Linux, closes #68

modelica-3rdparty · Aug 11, 2022 · 97fb739 · 97fb739
1 parent 0b83bcb
commit 97fb739
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,10 +36,13 @@ jobs:
   build-macos:
     runs-on: ${{ matrix.platform }}
     strategy:
+      # Only use one build here, otherwise we cannot control which build is included in the release zip package
+      # Check the use of the ${MODELICA_PLATFORM} and ${MODELICA_COMPILER} variables in the CMake files
       matrix:
         include:
-          - platform: macos-11
-          - platform: macos-10.15
+          - platform: macos-latest
+          #- platform: macos-11
+          #- platform: macos-10.15
     steps:
     - uses: actions/checkout@v2
     - name: Create Build Environment
@@ -67,10 +70,13 @@ jobs:
   build-linux:
     runs-on: ${{ matrix.platform }}
     strategy:
+      # Only use one build here, otherwise we cannot control which build is included in the release zip package
+      # Check the use of the ${MODELICA_PLATFORM} and ${MODELICA_COMPILER} variables in the CMake files
       matrix:
         include:
-          - platform: ubuntu-20.04
-          - platform: ubuntu-18.04
+          - platform: ubuntu-latest
+          #- platform: ubuntu-20.04
+          #- platform: ubuntu-18.04
     steps:
     - uses: actions/checkout@v2
     - name: Create Build Environment
@@ -98,6 +104,8 @@ jobs:
   build-windows:
     runs-on: ${{ matrix.platform }}
     strategy:
+      # Use several builds here, Windows requires different builds for different compilers
+      # Check the use of the ${MODELICA_PLATFORM} and ${MODELICA_COMPILER} variables in the CMake files
       matrix:
         include:
           - platform: windows-2022

diff --git a/Projects/CMakeLists.txt b/Projects/CMakeLists.txt
@@ -240,6 +240,7 @@ if(WIN32)
     INSTALL(TARGETS "${LIBRARY_NAME}" DESTINATION "${MODELICA_INSTALL_PATH}/Library/${MODELICA_PLATFORM}/${MODELICA_COMPILER}")
 else()
     # Both OpenModelica and Dymola on Linux DO NOT expect a compiler-specific subdirectory
+    # NB: This means that subsequent builds for different compilers overwrite the previously installed binaries.
     message(STATUS "Installation path: ${MODELICA_INSTALL_PATH}/Library/${MODELICA_PLATFORM}")
     INSTALL(TARGETS "${LIBRARY_NAME}" DESTINATION "${MODELICA_INSTALL_PATH}/Library/${MODELICA_PLATFORM}")
 endif()