Skip to content

Commit 30219a0

Browse files
committed
Improve CI
- Make htmlproofer.sh runnable locally - Use existing noetic docker image
1 parent 6f48658 commit 30219a0

File tree

3 files changed

+11
-14
lines changed

3 files changed

+11
-14
lines changed

.github/workflows/ci.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ jobs:
5050

5151
- name: industrial_ci
5252
uses: ros-industrial/industrial_ci@master
53-
env: ${{ matrix.env }}
5453

5554
- name: upload test artifacts (on failure)
5655
uses: actions/upload-artifact@v2

.github/workflows/deploy.yaml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,14 @@ jobs:
1111
default:
1212
name: Build + Test + Deploy Website
1313
runs-on: ubuntu-latest
14+
container: ros:noetic-ros-base
1415
steps:
1516
- uses: actions/checkout@v2
16-
- uses: ros-tooling/[email protected]
17-
with:
18-
required-ros-distributions: noetic
19-
- uses: actions/setup-python@v2
20-
- uses: ruby/setup-ruby@v1
21-
with:
22-
ruby-version: '2.7'
23-
- name: "Build+Test: Run htmlproofer.sh"
17+
- name: "Install ruby"
18+
run: |
19+
apt-get update -q
20+
apt-get install -q -y ruby-dev libffi-dev build-essential git
21+
- name: "Run htmlproofer.sh"
2422
run: ./htmlproofer.sh
2523
- name: Deploy
2624
if: ${{ success() && github.event_name == 'push'}}

htmlproofer.sh

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

99
# Install htmlpoofer
10-
gem update --system
10+
sudo gem update --system --no-document
1111
gem --version
12-
gem install html-proofer -v 3.19.4 # newer 4.x requires different cmdline options
12+
sudo gem install html-proofer -v 3.19.4 # newer 4.x requires different cmdline options
1313
# Install ROS's version of sphinx
14-
sudo apt-get -qq install "ros-noetic-rosdoc-lite"
15-
source "/opt/ros/noetic/setup.bash"
14+
sudo apt-get -qq install "ros-$ROS_DISTRO-rosdoc-lite"
15+
source "/opt/ros/$ROS_DISTRO/setup.bash"
1616

1717
# Test build with non-ROS wrapped Sphinx command to allow warnings and errors to be caught
1818
sphinx-build -W -b html . native_build
1919
# Test build with ROS-version of Sphinx command so that it is generated same as ros.org
2020
rosdoc_lite -o build .
2121

2222
# Run HTML tests on generated build output to check for 404 errors, etc
23-
test "$TRAVIS_PULL_REQUEST" == false || URL_SWAP="--url-swap https\://github.com/ros-planning/moveit_tutorials/blob/master/:file\://$PWD/build/html/"
23+
URL_SWAP="--url-swap https\://github.com/ros-planning/moveit_tutorials/blob/master/:file\://$PWD/build/html/"
2424
htmlproofer ./build --only-4xx --check-html --file-ignore ./build/html/genindex.html,./build/html/search.html --alt-ignore '/.*/' --url-ignore '#' $URL_SWAP
2525

2626
# Tell GitHub Pages (on deploy) to bypass Jekyll processing

0 commit comments

Comments
 (0)