Skip to content

Commit 3a4f7de

Browse files
committed
CI: Fix + Update actions
1 parent 1c0d3df commit 3a4f7de

File tree

4 files changed

+18
-17
lines changed

4 files changed

+18
-17
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
name: ${{ matrix.env.IMAGE }}${{ matrix.env.CATKIN_LINT && ' + catkin_lint' || ''}}${{ matrix.env.CLANG_TIDY && ' + clang-tidy' || '' }}
3434
runs-on: ubuntu-latest
3535
steps:
36-
- uses: actions/checkout@v3
36+
- uses: actions/checkout@v4
3737
# The target directory cache doesn't include the source directory because
3838
# that comes from the checkout. See "prepare target_ws for cache" task below
3939
- name: Cache target workspace
@@ -63,7 +63,7 @@ jobs:
6363
env: ${{ matrix.env }}
6464

6565
- name: Upload test artifacts (on failure)
66-
uses: actions/upload-artifact@v3
66+
uses: actions/upload-artifact@v4
6767
if: failure() && (steps.ici.outputs.run_target_test || steps.ici.outputs.target_test_results)
6868
with:
6969
name: test-results-${{ matrix.env.IMAGE }}

.github/workflows/deploy.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@ jobs:
1919
runs-on: ubuntu-latest
2020
container: ros:noetic-ros-base
2121
steps:
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323
- name: Setup Pages
24-
uses: actions/configure-pages@v2
24+
uses: actions/configure-pages@v4
2525
if: github.repository_owner == 'ros-planning'
26-
- name: "Install ruby"
27-
run: |
28-
apt-get update -q
29-
apt-get install -q -y ruby-dev libffi-dev build-essential git
30-
26+
- uses: ruby/setup-ruby@v1
27+
with:
28+
ruby-version: '3'
3129
- name: "Run htmlproofer.sh"
32-
run: ./htmlproofer.sh
30+
run: |
31+
sudo apt-get update -q
32+
./htmlproofer.sh
3333
3434
- name: Upload pages artifact
35-
uses: actions/upload-pages-artifact@v1
35+
uses: actions/upload-pages-artifact@v3
3636
if: github.repository_owner == 'ros-planning'
3737
with:
3838
path: build/html
@@ -47,4 +47,4 @@ jobs:
4747
steps:
4848
- name: Deploy to GitHub Pages
4949
id: deployment
50-
uses: actions/deploy-pages@v1
50+
uses: actions/deploy-pages@v4

.github/workflows/format.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
name: pre-commit
1717
runs-on: ubuntu-20.04
1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020
- name: Install clang-format-10
2121
run: sudo apt-get install clang-format-10
2222
- uses: rhaschke/[email protected]
2323
with:
2424
distro: noetic
25-
- uses: pre-commit/[email protected].0
25+
- uses: pre-commit/[email protected].1

htmlproofer.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ export REPOSITORY_NAME=${PWD##*/}
77
echo "Testing branch ${GITHUB_BASE_REF:-$GITHUB_HEAD_REF} of $REPOSITORY_NAME"
88

99
# Install htmlpoofer
10-
sudo gem update --system --no-document
11-
gem --version
12-
sudo gem install html-proofer -v 3.19.4 # newer 4.x requires different cmdline options
10+
echo "gem $(gem --version)"
11+
gem install --user-install html-proofer -v 3.19.4 # newer 4.x requires different cmdline options
12+
PATH="$(ruby -r rubygems -e 'puts Gem.user_dir')/bin:$PATH"
13+
1314
# Install ROS's version of sphinx
1415
sudo apt-get -qq install "ros-$ROS_DISTRO-rosdoc-lite"
1516
source "/opt/ros/$ROS_DISTRO/setup.bash"

0 commit comments

Comments
 (0)