Skip to content

Commit

Permalink
Cleanup CI and docker file (#966)
Browse files Browse the repository at this point in the history
  • Loading branch information
Levi-Armstrong authored Nov 20, 2023
1 parent 5534138 commit 7891aad
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 21 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/add_ros_apt_sources.sh

This file was deleted.

6 changes: 4 additions & 2 deletions .github/workflows/clang_format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,16 @@ on:

jobs:
clang_format:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v1

- name: Run clang format
run: |
sudo apt update
sudo apt install -y git clang-format
sudo apt install -y git clang-format-8
if [ $? -ge 1 ]; then return 1; fi
./.run-clang-format
if [ $? -ge 1 ]; then return 1; fi
output=$(git diff)
if [ -n "$output" ]; then exit 1; else exit 0; fi
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
workflow_dispatch:

jobs:
industrial_ci:
ci:
if: contains(github.event.pull_request.labels.*.name, 'check-tesseract-ros') || github.event.schedule == true
name: ${{ matrix.distro }}
runs-on: ubuntu-latest
Expand Down
19 changes: 5 additions & 14 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,11 @@ USER root

# Install
RUN apt update \
&& apt install -y \
curl \
lsb-release \
git \
build-essential

# Install ROS sources and tooling dependencies
COPY .github/workflows/add_ros_apt_sources.sh /tmp/add_ros_apt_sources.sh
RUN ./tmp/add_ros_apt_sources.sh \
&& apt install -y \
python3-colcon-common-extensions \
python3-rosdep \
python3-vcstool \
liboctomap-dev \
&& apt upgrade -y \
&& apt install -y cmake curl git python3 python3-distutils python3-pip liboctomap-dev \
&& python3 -m pip install vcstool -q \
&& python3 -m pip install colcon-common-extensions -q \
&& python3 -m pip install rosdep -q \
&& rosdep init \
&& rosdep update

Expand Down

0 comments on commit 7891aad

Please sign in to comment.