From a24580153a5eaca6cb5f04ddf909d17a091df10c Mon Sep 17 00:00:00 2001 From: Joris Vaillant Date: Mon, 13 Nov 2023 16:44:27 +0100 Subject: [PATCH 1/3] cmake: update jrlcmakemodules to support python3.12 --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index 9924c7e14..1f6b9ebae 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 9924c7e1472bdb5e50a92432452fde48fe663c3b +Subproject commit 1f6b9ebae6c0e16c6eedd869d459ef6a0da41151 From 5d46fc9f878fa4b4e191b5d6e1932f756b597a16 Mon Sep 17 00:00:00 2001 From: Joris Vaillant Date: Mon, 13 Nov 2023 17:00:38 +0100 Subject: [PATCH 2/3] ci: add check step --- .github/workflows/macos-linux-conda.yml | 15 +++++++++++++++ .github/workflows/ros_ci.yml | 15 +++++++++++++++ .github/workflows/windows-conda-clang.yml | 15 +++++++++++++++ .github/workflows/windows-conda-v142.yml | 15 +++++++++++++++ 4 files changed, 60 insertions(+) diff --git a/.github/workflows/macos-linux-conda.yml b/.github/workflows/macos-linux-conda.yml index ffa3fa956..c2c852354 100644 --- a/.github/workflows/macos-linux-conda.yml +++ b/.github/workflows/macos-linux-conda.yml @@ -60,3 +60,18 @@ jobs: run: | cd build make uninstall + + check: + if: always() + name: check-macos-linux-conda + + needs: + - hpp-fcl-conda + + runs-on: Ubuntu-latest + + steps: + - name: Decide whether the needed jobs succeeded or failed + uses: re-actors/alls-green@release/v1 + with: + jobs: ${{ toJSON(needs) }} diff --git a/.github/workflows/ros_ci.yml b/.github/workflows/ros_ci.yml index 1765da443..5e0d756d4 100644 --- a/.github/workflows/ros_ci.yml +++ b/.github/workflows/ros_ci.yml @@ -32,3 +32,18 @@ jobs: # Run industrial_ci - uses: 'ros-industrial/industrial_ci@9f963f67ebb889792175776c5ee00134d7bb569b' env: ${{ matrix.env }} + + check: + if: always() + name: check-ros-ci + + needs: + - CI + + runs-on: Ubuntu-latest + + steps: + - name: Decide whether the needed jobs succeeded or failed + uses: re-actors/alls-green@release/v1 + with: + jobs: ${{ toJSON(needs) }} diff --git a/.github/workflows/windows-conda-clang.yml b/.github/workflows/windows-conda-clang.yml index 8f62d1441..b912e71da 100644 --- a/.github/workflows/windows-conda-clang.yml +++ b/.github/workflows/windows-conda-clang.yml @@ -77,3 +77,18 @@ jobs: cd .. python -c "import hppfcl" if errorlevel 1 exit 1 + + check: + if: always() + name: check-windows-conda-clang + + needs: + - build + + runs-on: Ubuntu-latest + + steps: + - name: Decide whether the needed jobs succeeded or failed + uses: re-actors/alls-green@release/v1 + with: + jobs: ${{ toJSON(needs) }} diff --git a/.github/workflows/windows-conda-v142.yml b/.github/workflows/windows-conda-v142.yml index dabd125bf..825cefbd7 100644 --- a/.github/workflows/windows-conda-v142.yml +++ b/.github/workflows/windows-conda-v142.yml @@ -76,3 +76,18 @@ jobs: cd .. python -c "import hppfcl" if errorlevel 1 exit 1 + + check: + if: always() + name: check-windows-conda-v142 + + needs: + - build + + runs-on: Ubuntu-latest + + steps: + - name: Decide whether the needed jobs succeeded or failed + uses: re-actors/alls-green@release/v1 + with: + jobs: ${{ toJSON(needs) }} From b04c8b41742bc7798caca2e29c5463bc0ad9a6b1 Mon Sep 17 00:00:00 2001 From: Joris Vaillant Date: Mon, 13 Nov 2023 17:00:54 +0100 Subject: [PATCH 3/3] Provide conda build for python 3.10, 3.11 and 3.12 --- .github/workflows/macos-linux-conda.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos-linux-conda.yml b/.github/workflows/macos-linux-conda.yml index c2c852354..ebd0ce879 100644 --- a/.github/workflows/macos-linux-conda.yml +++ b/.github/workflows/macos-linux-conda.yml @@ -11,6 +11,7 @@ jobs: fail-fast: false matrix: os: ["ubuntu-latest", "macos-latest"] + python-version: ["3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v3 @@ -22,7 +23,7 @@ jobs: activate-environment: hpp-fcl auto-update-conda: true environment-file: .github/workflows/conda/conda-env.yml - python-version: "3.10" + python-version: ${{ matrix.python-version }} - name: Install compilers on OSX if: contains(matrix.os, 'macos')