diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml index f4b8811..9ce0da1 100644 --- a/.github/workflows/format.yaml +++ b/.github/workflows/format.yaml @@ -8,10 +8,9 @@ on: [push, pull_request] jobs: pre-commit: name: Format - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v4 - name: Install clang-format-10 run: sudo apt-get install clang-format-10 - - uses: pre-commit/action@v2.0.0 + - uses: pre-commit/action@v3.0.1 diff --git a/.github/workflows/industrial_ci_action.yaml b/.github/workflows/industrial_ci_action.yaml index d7dfb1b..9b9d7be 100644 --- a/.github/workflows/industrial_ci_action.yaml +++ b/.github/workflows/industrial_ci_action.yaml @@ -21,8 +21,6 @@ jobs: - ROS_DISTRO: melodic ROS_REPO: main CATKIN_LINT: true - - ROS_DISTRO: kinetic - ROS_REPO: main env: CCACHE_DIR: "${{ github.workspace }}/.ccache" BASEDIR: ${{ github.workspace }}/.work @@ -31,30 +29,32 @@ jobs: name: "${{ matrix.env.ROS_DISTRO }}-${{ matrix.env.ROS_REPO }}${{ matrix.env.CATKIN_LINT && ' + catkin_lint' || ''}}" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 # 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 if: ${{ ! matrix.env.CCOV }} - uses: pat-s/always-upload-cache@v2.1.5 + uses: actions/cache@v4 with: + save-always: true 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: actions/cache@v4 with: + save-always: true path: ${{ env.CCACHE_DIR }} key: ccache-${{ env.CACHE_PREFIX }}-${{ github.sha }}-${{ github.run_id }} restore-keys: | ccache-${{ env.CACHE_PREFIX }}-${{ github.sha }} ccache-${{ env.CACHE_PREFIX }} - name: industrial_ci - uses: 'ros-industrial/industrial_ci@master' + uses: ros-industrial/industrial_ci@master env: ${{ matrix.env }} - name: upload test artifacts (on failure) - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: failure() with: name: test-results diff --git a/.github/workflows/prerelease.yaml b/.github/workflows/prerelease.yaml index d2b0ba4..ce493bc 100644 --- a/.github/workflows/prerelease.yaml +++ b/.github/workflows/prerelease.yaml @@ -5,22 +5,23 @@ name: pre-release on: workflow_dispatch: + inputs: + ROS_DISTRO: + type: string + required: true + description: 'ROS distribution codename:' + default: noetic jobs: default: - strategy: - fail-fast: false - matrix: - distro: [melodic, noetic] - env: - ROS_DISTRO: ${{ matrix.distro }} + ROS_DISTRO: ${{ inputs.ROS_DISTRO }} PRERELEASE: true BASEDIR: ${{ github.workspace }}/.work - name: "${{ matrix.distro }}" + name: "${{ inputs.ROS_DISTRO }}" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: industrial_ci uses: ros-industrial/industrial_ci@master diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0a5267b..30065a7 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: v3.4.0 + rev: v4.6.0 hooks: - id: check-added-large-files - id: check-case-conflict @@ -28,7 +28,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/psf/black - rev: 22.3.0 + rev: 24.8.0 hooks: - id: black