From 3ddcda01dad1d42df7c1b0068e97ac6d358226e6 Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Mon, 26 Aug 2024 09:12:31 -0700 Subject: [PATCH 1/5] Add missing C++ and Fortran to Intel oneAPI CI * Add Fortran and C++ to Autotools * Add Fortran and C++ to Linux CMake * Add C++ to Windows CMake * Fix bad GitHub workspace variable --- .github/workflows/intel-auto.yml | 3 ++- .github/workflows/intel-cmake.yml | 13 +++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/intel-auto.yml b/.github/workflows/intel-auto.yml index ea983c3a76b..6e0380efb4e 100644 --- a/.github/workflows/intel-auto.yml +++ b/.github/workflows/intel-auto.yml @@ -46,7 +46,8 @@ jobs: $GITHUB_WORKSPACE/configure \ --enable-build-mode=${{ inputs.build_mode }} \ --enable-shared \ - --disable-fortran + --enable-cxx \ + --enable-fortran - name: Autotools Build shell: bash diff --git a/.github/workflows/intel-cmake.yml b/.github/workflows/intel-cmake.yml index a8d5b7d49b8..15813a3f1e4 100644 --- a/.github/workflows/intel-cmake.yml +++ b/.github/workflows/intel-cmake.yml @@ -47,9 +47,11 @@ jobs: -G Ninja \ --log-level=VERBOSE \ -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} \ + -DHDF5_BUILD_FORTRAN:BOOL=ON \ + -DHDF5_BUILD_CPP_LIB:BOOL=ON \ -DLIBAEC_USE_LOCALCONTENT=OFF \ -DZLIB_USE_LOCALCONTENT=OFF \ - $GITHUB_WORKSPACE + ${{ github.workspace }} - name: CMake Build (Linux) shell: bash @@ -97,7 +99,14 @@ jobs: run: | mkdir "${{ runner.workspace }}/build" Set-Location -Path "${{ runner.workspace }}\\build" - cmake -C ${{ github.workspace }}/config/cmake/cacheinit.cmake -G Ninja -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} -DHDF5_BUILD_FORTRAN=ON -DLIBAEC_USE_LOCALCONTENT=OFF -DZLIB_USE_LOCALCONTENT=OFF ${{ github.workspace }} + cmake -C ${{ github.workspace }}/config/cmake/cacheinit.cmake \ + -G Ninja \ + -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} \ + -DHDF5_BUILD_FORTRAN=ON \ + -DHDF5_BUILD_CPP_LIB=ON \ + -DLIBAEC_USE_LOCALCONTENT=OFF \ + -DZLIB_USE_LOCALCONTENT=OFF \ + ${{ github.workspace }} - name: CMake Build (Windows) shell: pwsh From b95bd407249433d0eefa2185826a163107779c82 Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Mon, 26 Aug 2024 09:21:01 -0700 Subject: [PATCH 2/5] Fix -G Ninja lines in CMake --- .github/workflows/intel-cmake.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/intel-cmake.yml b/.github/workflows/intel-cmake.yml index 15813a3f1e4..9bed18ceb36 100644 --- a/.github/workflows/intel-cmake.yml +++ b/.github/workflows/intel-cmake.yml @@ -43,9 +43,7 @@ jobs: run: | mkdir "${{ runner.workspace }}/build" cd "${{ runner.workspace }}/build" - cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake \ - -G Ninja \ - --log-level=VERBOSE \ + cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake -G Ninja --log-level=VERBOSE \ -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} \ -DHDF5_BUILD_FORTRAN:BOOL=ON \ -DHDF5_BUILD_CPP_LIB:BOOL=ON \ @@ -99,8 +97,7 @@ jobs: run: | mkdir "${{ runner.workspace }}/build" Set-Location -Path "${{ runner.workspace }}\\build" - cmake -C ${{ github.workspace }}/config/cmake/cacheinit.cmake \ - -G Ninja \ + cmake -C ${{ github.workspace }}/config/cmake/cacheinit.cmake -G Ninja \ -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} \ -DHDF5_BUILD_FORTRAN=ON \ -DHDF5_BUILD_CPP_LIB=ON \ From 1c9c8dc732edb801898c0aedd8b138ae11560588 Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Mon, 26 Aug 2024 09:31:53 -0700 Subject: [PATCH 3/5] Try ^ for Windows-only line continuation --- .github/workflows/intel-cmake.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/intel-cmake.yml b/.github/workflows/intel-cmake.yml index 9bed18ceb36..ee5a7e797d4 100644 --- a/.github/workflows/intel-cmake.yml +++ b/.github/workflows/intel-cmake.yml @@ -98,11 +98,11 @@ jobs: mkdir "${{ runner.workspace }}/build" Set-Location -Path "${{ runner.workspace }}\\build" cmake -C ${{ github.workspace }}/config/cmake/cacheinit.cmake -G Ninja \ - -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} \ - -DHDF5_BUILD_FORTRAN=ON \ - -DHDF5_BUILD_CPP_LIB=ON \ - -DLIBAEC_USE_LOCALCONTENT=OFF \ - -DZLIB_USE_LOCALCONTENT=OFF \ + -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} ^ + -DHDF5_BUILD_FORTRAN=ON ^ + -DHDF5_BUILD_CPP_LIB=ON ^ + -DLIBAEC_USE_LOCALCONTENT=OFF ^ + -DZLIB_USE_LOCALCONTENT=OFF ^ ${{ github.workspace }} - name: CMake Build (Windows) From ef11036401b16d765de0f5361382679014bbb6a5 Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Mon, 26 Aug 2024 09:39:25 -0700 Subject: [PATCH 4/5] Missed a caret --- .github/workflows/intel-cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/intel-cmake.yml b/.github/workflows/intel-cmake.yml index ee5a7e797d4..83e7e158a50 100644 --- a/.github/workflows/intel-cmake.yml +++ b/.github/workflows/intel-cmake.yml @@ -97,7 +97,7 @@ jobs: run: | mkdir "${{ runner.workspace }}/build" Set-Location -Path "${{ runner.workspace }}\\build" - cmake -C ${{ github.workspace }}/config/cmake/cacheinit.cmake -G Ninja \ + cmake -C ${{ github.workspace }}/config/cmake/cacheinit.cmake -G Ninja ^ -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} ^ -DHDF5_BUILD_FORTRAN=ON ^ -DHDF5_BUILD_CPP_LIB=ON ^ From 85c43176f38f7694b753be692f0938c74e59421f Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Mon, 26 Aug 2024 09:47:12 -0700 Subject: [PATCH 5/5] Fine, everything can go on one line for Windows --- .github/workflows/intel-cmake.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/intel-cmake.yml b/.github/workflows/intel-cmake.yml index 83e7e158a50..fb703d480b3 100644 --- a/.github/workflows/intel-cmake.yml +++ b/.github/workflows/intel-cmake.yml @@ -97,13 +97,7 @@ jobs: run: | mkdir "${{ runner.workspace }}/build" Set-Location -Path "${{ runner.workspace }}\\build" - cmake -C ${{ github.workspace }}/config/cmake/cacheinit.cmake -G Ninja ^ - -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} ^ - -DHDF5_BUILD_FORTRAN=ON ^ - -DHDF5_BUILD_CPP_LIB=ON ^ - -DLIBAEC_USE_LOCALCONTENT=OFF ^ - -DZLIB_USE_LOCALCONTENT=OFF ^ - ${{ github.workspace }} + cmake -C ${{ github.workspace }}/config/cmake/cacheinit.cmake -G Ninja -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} -DHDF5_BUILD_FORTRAN=ON -DHDF5_BUILD_CPP_LIB=ON -DLIBAEC_USE_LOCALCONTENT=OFF -DZLIB_USE_LOCALCONTENT=OFF ${{ github.workspace }} - name: CMake Build (Windows) shell: pwsh