Skip to content

Commit

Permalink
CI: Update actions
Browse files Browse the repository at this point in the history
  • Loading branch information
rhaschke committed Aug 28, 2024
1 parent 4ed0657 commit 8c593ec
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 28 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ on:
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
29 changes: 15 additions & 14 deletions .github/workflows/industrial_ci_action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ jobs:
matrix:
env:
- {
ROS_DISTRO: melodic,
ROS_REPO: main,
CCOV_UPLOAD: true,
ROS_DISTRO: melodic,
ROS_REPO: main,
CCOV_UPLOAD: true,
CATKIN_LINT: pedatntic,
CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS='--coverage' -DCMAKE_CXX_FLAGS='--coverage'",
AFTER_RUN_TARGET_TEST: './.ci.prepare_codecov',
ADDITIONAL_DEBS: 'lcov'
}
- {
ROS_DISTRO: kinetic,
ROS_REPO: main,
CCOV_UPLOAD: false,
BEFORE_BUILD_TARGET_WORKSPACE: './.ci.mongo_source_install',
ROS_DISTRO: kinetic,
ROS_REPO: main,
CCOV_UPLOAD: false,
BEFORE_BUILD_TARGET_WORKSPACE: './.ci.mongo_source_install',
ROSDEP_SKIP_KEYS: 'libmongoclient-dev',
ADDITIONAL_DEBS: 'libssl-dev scons git'
}
Expand All @@ -33,21 +33,22 @@ jobs:
CACHE_PREFIX: "${{ matrix.env.ROS_DISTRO }}-${{ matrix.env.ROS_REPO }}${{ matrix.env.CCOV_UPLOAD && '-ccov' || '' }}"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
- uses: actions/checkout@v4
- uses: actions/cache@v4
with:
save-always: true
path: ${{ env.CCACHE_DIR }}
key: ccache-${{ env.CACHE_PREFIX }}-${{ github.sha }}
key: ccache-${{ env.CACHE_PREFIX }}-${{ github.sha }}
restore-keys: |
ccache-${{ env.CACHE_PREFIX }}
- uses: 'ros-industrial/industrial_ci@master'
- uses: ros-industrial/industrial_ci@master
env: ${{ matrix.env }}
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
if: failure()
with:
name: test-results
path: ${{ env.BASEDIR }}/target_ws/**/test_results/**/*.xml
- uses: codecov/codecov-action@v1
if: ${{ matrix.env.CCOV_UPLOAD }}
- uses: codecov/codecov-action@v4
if: ${{ matrix.env.CCOV_UPLOAD }}
with:
files: ${{ env.BASEDIR }}/coverage.info
20 changes: 12 additions & 8 deletions .github/workflows/prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,26 @@ name: pre-release

on:
workflow_dispatch:
inputs:
ROS_DISTRO:
type: string
required: true
description: 'ROS distribution codename:'
default: melodic

permissions:
contents: read # to fetch code (actions/checkout)

jobs:
default:
strategy:
fail-fast: false
matrix:
distro: [melodic]

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
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -38,7 +38,7 @@ repos:
args: ['-fallback-style=none', '-i']

- repo: https://github.com/psf/black
rev: 22.3.0
rev: 24.8.0
hooks:
- id: black

Expand Down

0 comments on commit 8c593ec

Please sign in to comment.