Merge branch 'develop' into var_speed_cond_ctrl

NREL · Jun 13, 2024 · 26a11b9 · 26a11b9 · nrel-bot-2b · Jun 13, 2024
2 parents cd43308 + 6b69184
commit 26a11b9
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 40 deletions.
diff --git a/.github/workflows/linux_release.yml b/.github/workflows/linux_release.yml
@@ -8,7 +8,7 @@ on:
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   BUILD_TYPE: Release
-  Python_REQUIRED_VERSION: 3.8
+  Python_REQUIRED_VERSION: 3.12.2
 
 jobs:
   build_installer_artifact:
@@ -19,7 +19,7 @@ jobs:
       # fail-fast: Default is true, switch to false to allow one platform to fail and still run others
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04]
+        os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
 
     permissions:
       # Needed permission to upload the release asset
@@ -30,7 +30,7 @@ jobs:
 
     - name: Set up Python ${{ env.Python_REQUIRED_VERSION }}
       id: setup-python
-      uses: actions/setup-python@v5
+      uses: jmarrec/setup-python@v5
       with:
         python-version: ${{ env.Python_REQUIRED_VERSION }}
 
@@ -51,6 +51,10 @@ jobs:
         echo "Using Apt to install dependencies"
         sudo apt-get update
         sudo apt-get install texlive texlive-xetex texlive-science libxkbcommon-x11-0 xorg-dev libgl1-mesa-dev
+        if [[ "${{ matrix.os }}" == "ubuntu-24.04" ]]; then
+          # https://github.com/actions/runner-images/issues/10025
+          echo "FC=gfortran-13" >> $GITHUB_ENV
+        fi
 
     - name: Create Build Directory
       run: cmake -E make_directory ./build/
@@ -119,22 +123,25 @@ jobs:
       # fail-fast: Default is true, switch to false to allow one platform to fail and still run others
       fail-fast: false
       matrix:
-        name: [20, 22]
+        name: [20, 22, 24]
         include:
           - name: 20
             os: ubuntu-20.04
             test_key: ubuntu2004
           - name: 22
             os: ubuntu-22.04
             test_key: ubuntu2204
+          - name: 24
+            os: ubuntu-24.04
+            test_key: ubuntu2404
 
     steps:
       - uses: actions/checkout@v4  # Still need E+ checked out to get testing scripts
         with:
           path: checkout
 
       - name: Set up Python ${{ env.Python_REQUIRED_VERSION }}
-        uses: actions/setup-python@v5
+        uses: jmarrec/setup-python@v5
         id: setup-python
         with:
           python-version: ${{ env.Python_REQUIRED_VERSION }}

diff --git a/.github/workflows/mac_release.yml b/.github/workflows/mac_release.yml
@@ -10,6 +10,7 @@ env:
   BUILD_TYPE: Release
   FC: gfortran-13
   SDKROOT: /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
+  Python_REQUIRED_VERSION: 3.12.2
 
 jobs:
   build_installer_artifact:
@@ -19,35 +20,37 @@ jobs:
       # fail-fast: Default is true, switch to false to allow one platform to fail and still run others
       fail-fast: false
       matrix:
-        macos_dev_target: [11.6, 12.1]  #, 13.0]
+        macos_dev_target: [12.1, 13.0]
         include:
-        - macos_dev_target: 11.6
-          os: macos-11
-          allow_failure: false
-          arch: x86_64
-          python: 3.8
         - macos_dev_target: 12.1
           os: macos-12
           allow_failure: false
           arch: x86_64
-          python: 3.8
-#        - macos_dev_target: 13.0
-#          os: macos-14
-#          allow_failure: false
-#          arch: arm64
-#          python: 3.12.0  # Make sure to add the package testing below for ARM once we add this build to GHA
+          python-arch: x64
+        - macos_dev_target: 13.0
+          os: macos-14
+          allow_failure: false
+          arch: arm64
+          python-arch: arm64
     permissions:
       # Needed permission to upload the release asset
       contents: write
 
     steps:
     - uses: actions/checkout@v4
 
-    - name: Set up Python ${{ matrix.python }}
+    - name: Remove python ${{ env.Python_REQUIRED_VERSION }} from the toolcache
+      run: |
+        ls $RUNNER_TOOL_CACHE/Python || true
+        rm -Rf "$RUNNER_TOOL_CACHE/Python/${{ env.Python_REQUIRED_VERSION }}"
+        rm -Rf "$RUNNER_TOOL_CACHE/Python/${{ env.Python_REQUIRED_VERSION }}*/"
+
+    - name: Set up Python ${{ env.Python_REQUIRED_VERSION }}
       id: setup-python
-      uses: actions/setup-python@v5
+      uses: jmarrec/setup-python@v5
       with:
-        python-version: ${{ matrix.python }}
+        python-version: ${{ env.Python_REQUIRED_VERSION }}
+        # check-latest: true # Force pick up the python I built instead of the (potential) toolcache one. I could also do `rm -Rf $RUNNER_TOOL_CACHE/Python/3.12.2` before this action
 
     - name: Setup QtIFW 4.x
       uses: jmarrec/setup-qtifw@v1
@@ -86,7 +89,7 @@ jobs:
         cmake -DCMAKE_BUILD_TYPE:STRING=$BUILD_TYPE \
               -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${{ matrix.macos_dev_target }} \
               -DLINK_WITH_PYTHON:BOOL=ON -DPython_REQUIRED_VERSION:STRING=${{ steps.setup-python.outputs.python-version }} \
-              -DPython_ROOT_DIR:PATH=$RUNNER_TOOL_CACHE/Python/${{ steps.setup-python.outputs.python-version }}/x64/ \
+              -DPython_ROOT_DIR:PATH=$RUNNER_TOOL_CACHE/Python/${{ steps.setup-python.outputs.python-version }}/${{ matrix.python-arch }}/ \
               -DBUILD_FORTRAN:BOOL=ON -DBUILD_PACKAGE:BOOL=ON \
               -DDOCUMENTATION_BUILD:STRING="BuildWithAll" -DTEX_INTERACTION:STRING="batchmode" \
               -DENABLE_OPENMP:BOOL=OFF -DUSE_OpenMP:BOOL=OFF \
@@ -146,22 +149,16 @@ jobs:
       # fail-fast: Default is true, switch to false to allow one platform to fail and still run others
       fail-fast: false
       matrix:
-        macos_dev_target: [ 11.6, 12.1 ]  #, 13.0]
+        macos_dev_target: [ 12.1, 13.0]
         include:
-          - macos_dev_target: 11.6
-            os: macos-11
-            arch: x86_64
-            python: 3.8
-            test_key: mac11
           - macos_dev_target: 12.1
             os: macos-12
-            arch: x86_64
-            python: 3.8
+            python-arch: x64
             test_key: mac12
-    #        - macos_dev_target: 13.0
-    #          os: macos-14
-    #          arch: arm64
-    #          python: 3.12.0  # Make sure to add the package testing below for ARM once we add this build to GHA
+          - macos_dev_target: 13.0
+            os: macos-14
+            python-arch: arm64
+            test_key: mac13-arm64
 
     steps:
       - uses: actions/checkout@v4  # Still need E+ checked out to get testing scripts
@@ -173,7 +170,7 @@ jobs:
         id: setup-python
         with:
           python-version: ${{ env.Python_REQUIRED_VERSION }}
-          architecture: ${{ matrix.arch }}
+          architecture: ${{ matrix.python-arch }}
 
       - name: Gather Test Package from Artifacts
         uses: actions/download-artifact@v4

diff --git a/.github/workflows/windows_release.yml b/.github/workflows/windows_release.yml
@@ -9,7 +9,7 @@ env:
   CMAKE_Fortran_COMPILER: "/c/msys64/mingw64/bin/x86_64-w64-mingw32-gfortran.exe"
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   BUILD_TYPE: Release
-  Python_REQUIRED_VERSION: 3.8
+  Python_REQUIRED_VERSION: 3.12.2
 
 jobs:
   build_installer_artifact:
@@ -52,7 +52,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up Python ${{ env.Python_REQUIRED_VERSION }}
-      uses: actions/setup-python@v5
+      uses: jmarrec/setup-python@v5
       id: setup-python
       with:
         python-version: ${{ env.Python_REQUIRED_VERSION }}

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -191,7 +191,7 @@ if(LINK_WITH_PYTHON)
   if(Python_REQUIRED_VERSION)
     find_package(Python ${Python_REQUIRED_VERSION} EXACT COMPONENTS Interpreter Development REQUIRED)
   else()
-    find_package(Python 3.8 COMPONENTS Interpreter Development REQUIRED)
+    find_package(Python 3.12 COMPONENTS Interpreter Development REQUIRED)
   endif()
 else()
   find_package(Python 3.6 COMPONENTS Interpreter REQUIRED)

diff --git a/scripts/package_tests/runner.py b/scripts/package_tests/runner.py
@@ -86,15 +86,15 @@ class OS:
     'ubuntu2204': {
         'os': OS.Linux, 'bitness': 'x64', 'asset_pattern': 'Linux-Ubuntu22.04-x86_64.tar.gz', 'os_version': '22.04'
     },
+    'ubuntu2404': {
+        'os': OS.Linux, 'bitness': 'x64', 'asset_pattern': 'Linux-Ubuntu24.04-x86_64.tar.gz', 'os_version': '24.04'
+    },
     'mac11': {
         'os': OS.Mac, 'bitness': 'x64', 'asset_pattern': 'Darwin-macOS11.6-x86_64.tar.gz', 'os_version': '11.6'
     },
     'mac12': {
         'os': OS.Mac, 'bitness': 'x64', 'asset_pattern': 'Darwin-macOS12.1-x86_64.tar.gz', 'os_version': '12.1'
     },
-    'mac12-arm64': {
-        'os': OS.Mac, 'bitness': 'arm64', 'asset_pattern': 'Darwin-macOS12.1-arm64.tar.gz', 'os_version': '12'
-    },
     'mac13-arm64': {
         'os': OS.Mac, 'bitness': 'arm64', 'asset_pattern': 'Darwin-macOS13-arm64.tar.gz', 'os_version': '13'
     },