From cf39ba47481afd2868330716a5b0e338dc75a254 Mon Sep 17 00:00:00 2001 From: Robert Haschke Date: Wed, 13 Sep 2023 17:20:50 +0200 Subject: [PATCH] Update CI config - Update action versions to silent deprecation warnings - Remove Melodic build (eol): vcstool fails to import upstream workspace. --- .github/workflows/ci.yaml | 14 +++++--------- .github/workflows/format.yaml | 19 ++++--------------- 2 files changed, 9 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 09c9de8..214884b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -11,10 +11,6 @@ jobs: fail-fast: false matrix: env: - - IMAGE: melodic - CCOV: true - CATKIN_LINT: true - UPSTREAM_WORKSPACE: github:PickNikRobotics/rviz_visual_tools#master - IMAGE: noetic CATKIN_LINT: true env: @@ -31,16 +27,16 @@ jobs: name: "${{ matrix.env.IMAGE }}${{ matrix.env.CATKIN_LINT && ' + catkin_lint' || ''}}${{ matrix.env.CCOV && ' + ccov' || ''}}${{ matrix.env.IKFAST_TEST && ' + ikfast' || ''}}${{ matrix.env.CLANG_TIDY && ' + clang-tidy' || '' }}" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: cache upstream_ws - uses: pat-s/always-upload-cache@v2.1.3 + uses: pat-s/always-upload-cache@v3 with: path: ${{ env.BASEDIR }}/upstream_ws key: upstream_ws-${{ env.CACHE_PREFIX }}-${{ hashFiles('upstream.rosinstall') }}-${{ github.run_id }} restore-keys: | upstream_ws-${{ env.CACHE_PREFIX }}-${{ hashFiles('upstream.rosinstall') }} - name: cache ccache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ env.CCACHE_DIR }} key: ccache-${{ env.CACHE_PREFIX }}-${{ github.sha }}-${{ github.run_id }} @@ -51,13 +47,13 @@ jobs: uses: 'ros-industrial/industrial_ci@master' env: ${{ matrix.env }} - name: upload test artifacts (on failure) - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: failure() with: name: test-results path: ${{ env.BASEDIR }}/target_ws/**/test_results/**/*.xml - name: upload codecov report - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v3 if: ${{ matrix.env.CCOV }} with: files: ${{ env.BASEDIR }}/coverage.info diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml index b3770ce..339612e 100644 --- a/.github/workflows/format.yaml +++ b/.github/workflows/format.yaml @@ -11,21 +11,10 @@ on: jobs: pre-commit: name: pre-commit - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v3 - name: Install clang-format-10 run: sudo apt-get install clang-format-10 - - name: Install catkin-lint - run: | - lsb_release -sc - sudo sh -c 'echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros-latest.list' - sudo apt-key adv --keyserver 'hkp://keyserver.ubuntu.com:80' --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 - sudo apt-get -q update - sudo apt-get -q install python3-rosdep - sudo rosdep init - rosdep update - sudo apt-get -q install catkin-lint - export ROS_DISTRO=noetic - - uses: pre-commit/action@v2.0.0 + - uses: rhaschke/install-catkin_lint-action@v1.0 + - uses: pre-commit/action@v3.0.0