From 0ccadcdf6376adc80b2308c49ee708a04b646037 Mon Sep 17 00:00:00 2001 From: Wolfgang Merkt Date: Tue, 21 Feb 2023 11:09:37 +0000 Subject: [PATCH 1/4] [CI] ROS: Activate prerelease --- .github/workflows/ci-linux-ros.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-linux-ros.yml b/.github/workflows/ci-linux-ros.yml index 675bbfed1..756d4d517 100644 --- a/.github/workflows/ci-linux-ros.yml +++ b/.github/workflows/ci-linux-ros.yml @@ -15,6 +15,7 @@ jobs: env: CCACHE_DIR: /github/home/.ccache # Enable ccache CMAKE_ARGS: -DBUILD_WITH_VECTORIZATION_SUPPORT=${{ matrix.env.VECTORIZATION_SUPPORT }} # Simde is available since humble + PRERELEASE: true runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 From f9275d2d7e45fb73cffca57a9b9f2747272a6e3e Mon Sep 17 00:00:00 2001 From: Wolfgang Merkt Date: Tue, 21 Feb 2023 11:54:19 +0000 Subject: [PATCH 2/4] [CI] Turn off ccache for prerelease builds --- .github/workflows/ci-linux-ros.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-linux-ros.yml b/.github/workflows/ci-linux-ros.yml index 756d4d517..b17877a98 100644 --- a/.github/workflows/ci-linux-ros.yml +++ b/.github/workflows/ci-linux-ros.yml @@ -13,7 +13,7 @@ jobs: - {ROS_DISTRO: rolling, CMAKE_BUILD_TYPE: Debug, VECTORIZATION_SUPPORT: ON} - {ROS_DISTRO: rolling, CMAKE_BUILD_TYPE: Release, VECTORIZATION_SUPPORT: ON} env: - CCACHE_DIR: /github/home/.ccache # Enable ccache + #CCACHE_DIR: /github/home/.ccache # Enable ccache CMAKE_ARGS: -DBUILD_WITH_VECTORIZATION_SUPPORT=${{ matrix.env.VECTORIZATION_SUPPORT }} # Simde is available since humble PRERELEASE: true runs-on: ubuntu-latest @@ -22,10 +22,10 @@ jobs: with: submodules: recursive # This step will fetch/store the directory used by ccache before/after the ci run - - uses: actions/cache@v3 - with: - path: ${{ env.CCACHE_DIR }} - key: ccache-${{ matrix.env.ROS_DISTRO }}-${{ matrix.env.ROS_REPO }} + #- uses: actions/cache@v3 + # with: + # path: ${{ env.CCACHE_DIR }} + # key: ccache-${{ matrix.env.ROS_DISTRO }}-${{ matrix.env.ROS_REPO }} # Run industrial_ci - uses: 'ros-industrial/industrial_ci@master' env: ${{ matrix.env }} From 09f8ba9b08a23176e6822863d41823e2dbe29805 Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Fri, 24 Feb 2023 11:53:27 +0100 Subject: [PATCH 3/4] ci: display CMAKE_ARGS --- .github/workflows/ci-linux-ros.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci-linux-ros.yml b/.github/workflows/ci-linux-ros.yml index b17877a98..168524632 100644 --- a/.github/workflows/ci-linux-ros.yml +++ b/.github/workflows/ci-linux-ros.yml @@ -27,5 +27,9 @@ jobs: # path: ${{ env.CCACHE_DIR }} # key: ccache-${{ matrix.env.ROS_DISTRO }}-${{ matrix.env.ROS_REPO }} # Run industrial_ci + - name: Display environment variables + env: ${{ matrix.env }} + run: | + echo "CMAKE_ARGS: "$CMAKE_ARGS - uses: 'ros-industrial/industrial_ci@master' env: ${{ matrix.env }} From 85161316d6bb4fc600a0a98b8a50a936efd237d0 Mon Sep 17 00:00:00 2001 From: Wolfgang Merkt Date: Fri, 24 Feb 2023 16:04:21 +0000 Subject: [PATCH 4/4] [CI] Only run prerelease for ros2 --- .github/workflows/ci-linux-ros.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-linux-ros.yml b/.github/workflows/ci-linux-ros.yml index 168524632..5d0e1045c 100644 --- a/.github/workflows/ci-linux-ros.yml +++ b/.github/workflows/ci-linux-ros.yml @@ -10,12 +10,13 @@ jobs: - {ROS_DISTRO: noetic, CMAKE_BUILD_TYPE: Release, VECTORIZATION_SUPPORT: OFF} - {ROS_DISTRO: humble, CMAKE_BUILD_TYPE: Debug, VECTORIZATION_SUPPORT: ON} - {ROS_DISTRO: humble, CMAKE_BUILD_TYPE: Release, VECTORIZATION_SUPPORT: ON} + - {ROS_DISTRO: humble, PRERELEASE: true} - {ROS_DISTRO: rolling, CMAKE_BUILD_TYPE: Debug, VECTORIZATION_SUPPORT: ON} - {ROS_DISTRO: rolling, CMAKE_BUILD_TYPE: Release, VECTORIZATION_SUPPORT: ON} + - {ROS_DISTRO: rolling, PRERELEASE: true} env: #CCACHE_DIR: /github/home/.ccache # Enable ccache CMAKE_ARGS: -DBUILD_WITH_VECTORIZATION_SUPPORT=${{ matrix.env.VECTORIZATION_SUPPORT }} # Simde is available since humble - PRERELEASE: true runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -27,9 +28,5 @@ jobs: # path: ${{ env.CCACHE_DIR }} # key: ccache-${{ matrix.env.ROS_DISTRO }}-${{ matrix.env.ROS_REPO }} # Run industrial_ci - - name: Display environment variables - env: ${{ matrix.env }} - run: | - echo "CMAKE_ARGS: "$CMAKE_ARGS - uses: 'ros-industrial/industrial_ci@master' env: ${{ matrix.env }}