From d48cf90453e8660fc01f4a087a0bcf7896ad8fc3 Mon Sep 17 00:00:00 2001 From: Vicente Adolfo Bolea Sanchez Date: Wed, 5 Jun 2024 19:38:06 -0400 Subject: [PATCH] ci,windows: add mingw-w64 build --- .github/workflows/everything.yml | 28 ++++++------------- .github/workflows/pypackaging.yml | 1 + .../ci/cmake/ci-win2022-mingw64-serial.cmake | 15 ++++++++++ scripts/ci/gh-actions/conda-env-win.yml | 1 + scripts/ci/gh-actions/windows-setup.ps1 | 7 +++++ 5 files changed, 33 insertions(+), 19 deletions(-) create mode 100644 scripts/ci/cmake/ci-win2022-mingw64-serial.cmake diff --git a/.github/workflows/everything.yml b/.github/workflows/everything.yml index 36165fc19f..46f2900ab3 100644 --- a/.github/workflows/everything.yml +++ b/.github/workflows/everything.yml @@ -110,7 +110,7 @@ jobs: ubuntu: needs: [format, git_checks] - if: needs.git_checks.outputs.num_code_changes > 0 + if: false runs-on: ubuntu-20.04 container: @@ -208,7 +208,7 @@ jobs: el8: needs: [format, git_checks] - if: needs.git_checks.outputs.num_code_changes > 0 + if: false runs-on: ubuntu-latest container: @@ -272,7 +272,7 @@ jobs: macos: needs: [format, git_checks] - if: needs.git_checks.outputs.num_code_changes > 0 + if: false runs-on: ${{ matrix.image }} env: @@ -361,21 +361,11 @@ jobs: strategy: fail-fast: false matrix: - os: [win2019, win2022] + os: [win2022] shared: [shared] - parallel: [serial, msmpi] - include: - - os: win2019 - image: windows-2019 - compiler: vs2019 - - os: win2022 - image: windows-2022 - compiler: vs2022 - - os: win2022 - image: windows-2022 - shared: static - compiler: vs2022 - parallel: serial + parallel: [serial] + image: [windows-2022] + compiler: [mingw64] defaults: run: @@ -407,7 +397,7 @@ jobs: docker: needs: [format, git_checks] - if: needs.git_checks.outputs.num_code_changes > 0 + if: false runs-on: ubuntu-latest strategy: @@ -472,7 +462,7 @@ jobs: # standard container job. contract: needs: [format, git_checks, docker] - if: needs.git_checks.outputs.num_code_changes > 0 + if: false runs-on: ubuntu-latest strategy: diff --git a/.github/workflows/pypackaging.yml b/.github/workflows/pypackaging.yml index 022807108e..b933c9dfd4 100644 --- a/.github/workflows/pypackaging.yml +++ b/.github/workflows/pypackaging.yml @@ -39,6 +39,7 @@ jobs: path: dist/*.tar.gz build_wheels: + if: false name: Wheel on ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: diff --git a/scripts/ci/cmake/ci-win2022-mingw64-serial.cmake b/scripts/ci/cmake/ci-win2022-mingw64-serial.cmake new file mode 100644 index 0000000000..3e6b42f9bf --- /dev/null +++ b/scripts/ci/cmake/ci-win2022-mingw64-serial.cmake @@ -0,0 +1,15 @@ +set(dashboard_cache " +BUILD_TESTING:BOOL=ON +ADIOS2_BUILD_EXAMPLES:BOOL=ON + +ADIOS2_USE_BZip2:BOOL=OFF +ADIOS2_USE_Fortran:BOOL=OFF +ADIOS2_USE_MPI:BOOL=OFF +ADIOS2_USE_HDF5:STRING=ON +ADIOS2_USE_Python:BOOL=OFF +ADIOS2_USE_HDF5_VOL:STRING=OFF +") + +set(CTEST_CMAKE_GENERATOR "MinGW Makefiles") +list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}") +include(${CMAKE_CURRENT_LIST_DIR}/ci-common.cmake) diff --git a/scripts/ci/gh-actions/conda-env-win.yml b/scripts/ci/gh-actions/conda-env-win.yml index 68bc641ef4..7ac7630678 100644 --- a/scripts/ci/gh-actions/conda-env-win.yml +++ b/scripts/ci/gh-actions/conda-env-win.yml @@ -5,3 +5,4 @@ dependencies: - c-blosc2 - numpy>=1.19 - hdf5 + - m2w64-toolchain diff --git a/scripts/ci/gh-actions/windows-setup.ps1 b/scripts/ci/gh-actions/windows-setup.ps1 index 06209ef490..12890400da 100644 --- a/scripts/ci/gh-actions/windows-setup.ps1 +++ b/scripts/ci/gh-actions/windows-setup.ps1 @@ -4,6 +4,10 @@ Write-Host "::group::Setup CONDA" $Env:Path += ";$Env:CONDA\condabin" conda.bat init powershell conda.bat init bash +conda.bat update --all -y +conda.bat config --add channels conda-forge +conda.bat config --add channels msys2 +conda.bat config --set channel_priority strict Write-Host "::endgroup::" Write-Host "::group::Installing common deps" @@ -17,3 +21,6 @@ if($Env:GH_YML_MATRIX_PARALLEL -eq "msmpi") Write-Host "::endgroup::" } + +conda.bat list -n adios2 +conda.bat info --verbose