From 9a844ad7791d715dacf594867d77a287ce3ceb29 Mon Sep 17 00:00:00 2001 From: mosfet80 Date: Mon, 5 Aug 2024 09:36:31 +0200 Subject: [PATCH 1/7] Removed EOL distro - add jazzy ros Removed EOL distro add jazzy ros --- .github/workflows/build_and_test.yaml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index 3f6e48c..98c77e2 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -15,10 +15,9 @@ jobs: strategy: matrix: env: - - IMAGE: galactic-source - CLANG_TIDY: true - IMAGE: humble-source - IMAGE: rolling-source + - IMAGE: jazzy-source env: DOCKER_IMAGE: moveit/moveit2:${{ matrix.env.IMAGE }} @@ -33,11 +32,11 @@ jobs: name: ${{ matrix.env.IMAGE }}${{ matrix.env.CLANG_TIDY && ' + clang-tidy' || '' }} runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: cache upstream_ws - uses: pat-s/always-upload-cache@v3 + uses: pat-s/always-upload-cache@v4 with: path: ${{ env.BASEDIR }}/upstream_ws key: upstream_ws-${{ env.CACHE_PREFIX }}-${{ hashFiles('moveit_visual_tools.repos') }}-${{ github.run_id }} @@ -46,14 +45,14 @@ jobs: # The target directory cache doesn't include the source directory because # that comes from the checkout. See "prepare target_ws for cache" task below - name: cache target_ws - uses: pat-s/always-upload-cache@v3 + uses: pat-s/always-upload-cache@v4 with: path: ${{ env.BASEDIR }}/target_ws key: target_ws-${{ env.CACHE_PREFIX }}-${{ hashFiles('**/CMakeLists.txt', '**/package.xml') }}-${{ github.run_id }} restore-keys: | target_ws-${{ env.CACHE_PREFIX }}-${{ hashFiles('**/CMakeLists.txt', '**/package.xml') }} - name: cache ccache - uses: pat-s/always-upload-cache@v2.1.5 + uses: pat-s/always-upload-cache@v3.0.11 with: path: ${{ env.CCACHE_DIR }} key: ccache-${{ env.CACHE_PREFIX }}-${{ github.sha }}-${{ github.run_id }} From 103c63d83ed6a8ba83933aa47dcd1d55fe0cc88b Mon Sep 17 00:00:00 2001 From: mosfet80 Date: Mon, 5 Aug 2024 09:37:51 +0200 Subject: [PATCH 2/7] Update build_and_test.yaml --- .github/workflows/build_and_test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index 98c77e2..71a478d 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -36,7 +36,7 @@ jobs: with: fetch-depth: 0 - name: cache upstream_ws - uses: pat-s/always-upload-cache@v4 + uses: pat-s/always-upload-cache@v3 with: path: ${{ env.BASEDIR }}/upstream_ws key: upstream_ws-${{ env.CACHE_PREFIX }}-${{ hashFiles('moveit_visual_tools.repos') }}-${{ github.run_id }} From 49f0982cc789941a4fbbd1fcad1738a6a04760a8 Mon Sep 17 00:00:00 2001 From: mosfet80 Date: Mon, 5 Aug 2024 09:39:12 +0200 Subject: [PATCH 3/7] Update build_and_test.yaml --- .github/workflows/build_and_test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index 71a478d..24f814f 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -45,7 +45,7 @@ jobs: # The target directory cache doesn't include the source directory because # that comes from the checkout. See "prepare target_ws for cache" task below - name: cache target_ws - uses: pat-s/always-upload-cache@v4 + uses: pat-s/always-upload-cache@v3 with: path: ${{ env.BASEDIR }}/target_ws key: target_ws-${{ env.CACHE_PREFIX }}-${{ hashFiles('**/CMakeLists.txt', '**/package.xml') }}-${{ github.run_id }} From 58a6c12d50bec47abdf13631853e9bdb4b6ccf6e Mon Sep 17 00:00:00 2001 From: mosfet80 Date: Mon, 5 Aug 2024 09:48:43 +0200 Subject: [PATCH 4/7] Update format.yaml --- .github/workflows/format.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml index 1a42bd9..4cc6145 100644 --- a/.github/workflows/format.yaml +++ b/.github/workflows/format.yaml @@ -15,7 +15,7 @@ jobs: name: Format runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install clang-format-12 run: sudo apt-get install clang-format-12 - - uses: pre-commit/action@v3.0.0 + - uses: pre-commit/action@v3.0.1 From de5f74be4a816e30d7afe3f2a217199c27e98c4b Mon Sep 17 00:00:00 2001 From: mosfet80 Date: Mon, 5 Aug 2024 10:21:30 +0200 Subject: [PATCH 5/7] Update format.yaml switch to clang 14 --- .github/workflows/format.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml index 4cc6145..5314fae 100644 --- a/.github/workflows/format.yaml +++ b/.github/workflows/format.yaml @@ -16,6 +16,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Install clang-format-12 - run: sudo apt-get install clang-format-12 + - name: Install clang-format-14 + run: sudo apt-get install clang-format-14 - uses: pre-commit/action@v3.0.1 From 652139a870c9f55a6d91374539bc6cd33d1d0822 Mon Sep 17 00:00:00 2001 From: mosfet80 Date: Thu, 15 Aug 2024 08:44:41 +0200 Subject: [PATCH 6/7] Update build_and_test.yaml --- .github/workflows/build_and_test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index 24f814f..cf19a31 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -52,7 +52,7 @@ jobs: restore-keys: | target_ws-${{ env.CACHE_PREFIX }}-${{ hashFiles('**/CMakeLists.txt', '**/package.xml') }} - name: cache ccache - uses: pat-s/always-upload-cache@v3.0.11 + uses: pat-s/always-upload-cache@v3 with: path: ${{ env.CCACHE_DIR }} key: ccache-${{ env.CACHE_PREFIX }}-${{ github.sha }}-${{ github.run_id }} From f3ce81e4a1728e421d4f5a902a5e27804a923635 Mon Sep 17 00:00:00 2001 From: mosfet80 Date: Thu, 15 Aug 2024 08:47:00 +0200 Subject: [PATCH 7/7] Update .pre-commit-config.yaml --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bb36db9..d0b7b01 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,7 +15,7 @@ repos: # Standard hooks - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v4.6.0 hooks: - id: check-added-large-files - id: check-case-conflict @@ -33,7 +33,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/psf/black - rev: 23.3.0 + rev: 23.12.0 hooks: - id: black