From 9e3574041180293282c393e3f732fe0e4b3ce1b5 Mon Sep 17 00:00:00 2001 From: "Paul P.H. Wilson" Date: Sun, 6 Aug 2023 16:09:33 -0500 Subject: [PATCH 1/4] add limitation to cython version for MOAB compatibility --- CI/Dockerfile | 2 +- doc/CHANGELOG.rst | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CI/Dockerfile b/CI/Dockerfile index 10ef11db2a..a18ae3ed4d 100644 --- a/CI/Dockerfile +++ b/CI/Dockerfile @@ -52,7 +52,7 @@ RUN apt-get -y update; \ apt-get install -y git; \ update-alternatives --install /usr/bin/python python /usr/bin/python3 10; \ update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 10; \ - pip install cython; + pip install "cython<3"; ARG build_dir ARG install_dir diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst index 841e973b9e..915033aa5c 100644 --- a/doc/CHANGELOG.rst +++ b/doc/CHANGELOG.rst @@ -28,6 +28,7 @@ Next version * Patched cmake-search paths for double-down and MOAB (#878) * Patch to compile with gcc-13 (#882) * Tweak conda environment for Windows build to avoid conflicting gtest headers (#888) + * Restrict cython version for MOAB (#) v3.2.2 ==================== From e8b4be0cc35b7abc353fbf8dd3616009573c6620 Mon Sep 17 00:00:00 2001 From: "Paul P.H. Wilson" Date: Sun, 6 Aug 2023 16:15:17 -0500 Subject: [PATCH 2/4] add PR number --- doc/CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst index 915033aa5c..827d291c10 100644 --- a/doc/CHANGELOG.rst +++ b/doc/CHANGELOG.rst @@ -28,7 +28,7 @@ Next version * Patched cmake-search paths for double-down and MOAB (#878) * Patch to compile with gcc-13 (#882) * Tweak conda environment for Windows build to avoid conflicting gtest headers (#888) - * Restrict cython version for MOAB (#) + * Restrict cython version for MOAB (#893) v3.2.2 ==================== From 2b6843a636262a64b7e884421f49e00b0facfc19 Mon Sep 17 00:00:00 2001 From: "Paul P.H. Wilson" Date: Sun, 6 Aug 2023 16:26:13 -0500 Subject: [PATCH 3/4] don't run win/mac tests for CI docker changes --- .github/workflows/mac_build_test.yml | 8 ++++++++ .github/workflows/windows_build_test.yml | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/.github/workflows/mac_build_test.yml b/.github/workflows/mac_build_test.yml index bdea71c329..ddf13c71f8 100644 --- a/.github/workflows/mac_build_test.yml +++ b/.github/workflows/mac_build_test.yml @@ -6,9 +6,17 @@ on: pull_request: branches: - develop + paths-ignore: + - '.github/workflows/docker_publish.yml' + - '.github/workflows/housekeeping.yml' + - 'CI/**' push: branches: - develop + paths-ignore: + - '.github/workflows/docker_publish.yml' + - '.github/workflows/housekeeping.yml' + - 'CI/**' release: types: # This configuration does not affect the page_build event above diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml index 4a81330d0b..e5d43634e0 100644 --- a/.github/workflows/windows_build_test.yml +++ b/.github/workflows/windows_build_test.yml @@ -6,9 +6,17 @@ on: pull_request: branches: - develop + paths-ignore: + - '.github/workflows/docker_publish.yml' + - '.github/workflows/housekeeping.yml' + - 'CI/**' push: branches: - develop + paths-ignore: + - '.github/workflows/docker_publish.yml' + - '.github/workflows/housekeeping.yml' + - 'CI/**' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 17a0afa3642aa0c87323d8893d833d53785cdb45 Mon Sep 17 00:00:00 2001 From: "Paul P.H. Wilson" Date: Sun, 6 Aug 2023 16:28:41 -0500 Subject: [PATCH 4/4] don't run platform tests when other platform workflow files change --- .github/workflows/linux_build_test.yml | 4 ++++ .github/workflows/mac_build_test.yml | 4 ++++ .github/workflows/windows_build_test.yml | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/.github/workflows/linux_build_test.yml b/.github/workflows/linux_build_test.yml index 862ce01da1..d0e8e9a90b 100644 --- a/.github/workflows/linux_build_test.yml +++ b/.github/workflows/linux_build_test.yml @@ -8,6 +8,8 @@ on: - develop paths-ignore: - '.github/workflows/docker_publish.yml' + - '.github/workflows/mac_build_test.yml' + - '.github/workflows/windows_build_test.yml' - '.github/workflows/housekeeping.yml' - 'CI/**' push: @@ -15,6 +17,8 @@ on: - develop paths-ignore: - '.github/workflows/docker_publish.yml' + - '.github/workflows/mac_build_test.yml' + - '.github/workflows/windows_build_test.yml' - '.github/workflows/housekeeping.yml' - 'CI/**' diff --git a/.github/workflows/mac_build_test.yml b/.github/workflows/mac_build_test.yml index ddf13c71f8..7492278be1 100644 --- a/.github/workflows/mac_build_test.yml +++ b/.github/workflows/mac_build_test.yml @@ -8,6 +8,8 @@ on: - develop paths-ignore: - '.github/workflows/docker_publish.yml' + - '.github/workflows/linux_build_test.yml' + - '.github/workflows/windows_build_test.yml' - '.github/workflows/housekeeping.yml' - 'CI/**' push: @@ -15,6 +17,8 @@ on: - develop paths-ignore: - '.github/workflows/docker_publish.yml' + - '.github/workflows/linux_build_test.yml' + - '.github/workflows/windows_build_test.yml' - '.github/workflows/housekeeping.yml' - 'CI/**' diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml index e5d43634e0..8a625ccdb7 100644 --- a/.github/workflows/windows_build_test.yml +++ b/.github/workflows/windows_build_test.yml @@ -8,6 +8,8 @@ on: - develop paths-ignore: - '.github/workflows/docker_publish.yml' + - '.github/workflows/mac_build_test.yml' + - '.github/workflows/linux_build_test.yml' - '.github/workflows/housekeeping.yml' - 'CI/**' push: @@ -15,6 +17,8 @@ on: - develop paths-ignore: - '.github/workflows/docker_publish.yml' + - '.github/workflows/mac_build_test.yml' + - '.github/workflows/linux_build_test.yml' - '.github/workflows/housekeeping.yml' - 'CI/**'