Skip to content

Commit

Permalink
CI Update (#81)
Browse files Browse the repository at this point in the history
* Updated CI workflow

* Moved Python deps to package.xml
  • Loading branch information
marip8 authored Aug 8, 2024
1 parent 203c4bf commit dda7c4b
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 56 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/add_ros_apt_sources.sh

This file was deleted.

72 changes: 26 additions & 46 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
name: Ubuntu
name: Ubuntu [Focal, Jammy, Noble]

on:
push:
branches:
- master
pull_request:
branches:
- master
schedule:
- cron: '0 5 * * *'
workflow_dispatch:
release:
types:
- released
Expand All @@ -20,52 +19,33 @@ jobs:
strategy:
fail-fast: false
matrix:
distro: [focal, jammy]
env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}
PREFIX: ${{ github.repository }}_
distro: [focal, jammy, noble]
container:
image: ubuntu:${{ matrix.distro }}
env:
CCACHE_DIR: ${{ github.workspace }}/${{ matrix.distro }}/.ccache
DEBIAN_FRONTEND: noninteractive
TZ: Etc/UTC
steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Login to Github Packages
uses: docker/login-action@v2
uses: actions/checkout@v4
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
path: target_ws/src

- name: Extract Docker meta-information
id: meta
uses: docker/metadata-action@v3
- name: Build and Tests
uses: tesseract-robotics/colcon-action@v9
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
flavor: |
latest=false
prefix=
suffix=
tags: |
type=ref,event=branch,prefix=${{ matrix.distro }}-
type=semver,pattern={{major}}.{{minor}},prefix=${{ matrix.distro }}-
- name: Build repository
uses: 'tesseract-robotics/industrial_ci@2f4c8ab919f0aafddd514e586325defabd2911ea'
env:
DOCKER_IMAGE: ubuntu:${{ matrix.distro }}
ROS_DISTRO: false
PREFIX: ${{ github.repository }}_
UPSTREAM_WORKSPACE: dependencies.repos
ADDITIONAL_DEBS: 'curl lsb-release'
AFTER_INIT: './.github/workflows/add_ros_apt_sources.sh'
TARGET_CMAKE_ARGS: '-DENABLE_TESTING=ON -DENABLE_RUN_TESTING=OFF -DCMAKE_BUILD_TYPE=Release'
AFTER_INSTALL_TARGET_DEPENDENCIES: 'python3 -m pip install -r requirements.txt -qq'
BEFORE_RUN_TARGET_TEST: 'apt remove *-dev -y -qq'
BEFORE_RUN_TARGET_TEST_EMBED: 'ici_with_unset_variables source $BASEDIR/${PREFIX}target_ws/install/setup.bash'
AFTER_RUN_TARGET_TEST: 'python3 -m pytest -v'
AFTER_SCRIPT: 'rm -rf $BASEDIR/${PREFIX}upstream_ws/build $BASEDIR/${PREFIX}target_ws/build'
DOCKER_COMMIT: ${{ steps.meta.outputs.tags }}
before-script:
ccache-prefix: ${{ matrix.distro }}
add-ros-ppa: true
vcs-file: dependencies.repos
upstream-args: --cmake-args -DCMAKE_BUILD_TYPE=Release
target-path: target_ws/src
target-args: --cmake-args -DCMAKE_BUILD_TYPE=Debug -DENABLE_TESTING=ON -DENABLE_RUN_TESTING=OFF

- name: Push post-build Docker
if: ${{ github.ref == 'refs/heads/master' || github.event_name == 'release' || github.ref_type == 'tag' }}
run: docker push ${{ steps.meta.outputs.tags }}
- name: Python Tests
working-directory: target_ws/src
shell: bash
run: |
source ../install/setup.bash
python3 -m pytest -v
6 changes: 6 additions & 0 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@
<depend>libomp-dev</depend>
<depend>yaml-cpp</depend>
<test_depend>gtest</test_depend>
<exec_depend>python3-numpy</exec_depend>
<exec_depend>python3-scipy</exec_depend>
<exec_depend>python3-open3d</exec_depend>
<exec_depend>python3-tqdm</exec_depend>
<exec_depend>python3-matplotlib</exec_depend>
<exec_depend>python3-pytest</exec_depend>

<export>
<build_type>cmake</build_type>
Expand Down
6 changes: 0 additions & 6 deletions requirements.txt

This file was deleted.

0 comments on commit dda7c4b

Please sign in to comment.