Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: change test workflow to docker build #55

Merged
merged 4 commits into from
Sep 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .github/actions/build-test-humble-devel/action.yml

This file was deleted.

6 changes: 0 additions & 6 deletions .github/actions/build-test-humble/action.yml

This file was deleted.

35 changes: 0 additions & 35 deletions .github/common/build-test.sh

This file was deleted.

3 changes: 0 additions & 3 deletions .github/common/entrypoint.sh

This file was deleted.

44 changes: 12 additions & 32 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,31 @@
name: Build and Test

# Run workflow on pushes to main and develop branches, on any pull request, or by manual dispatch
on:
push:
branches:
- main
- develop
pull_request:
workflow_dispatch:

# Define the build test jobs
jobs:

check-contribution:
check:
name: Check if changelog and version have been updated
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Check contributions
if: ${{ github.event.pull_request.base.sha }}
- name: Check changelog
run: |
git fetch origin main ${{ github.event.pull_request.base.sha }}
VER_DIFF=$(git diff ${{ github.event.pull_request.base.sha }} ${{ github.sha }} -- ./VERSION)
if ! [ "${VER_DIFF}" ]; then
echo "::warning title=Contribution check failed::VERSION must be updated!"
echo "::warning title=Version check failed::VERSION must be updated!"
exit 1
fi
CL_DIFF=$(git diff ${{ github.event.pull_request.base.sha }} ${{ github.sha }} -- ./CHANGELOG.md)
if ! [ "${CL_DIFF}" ]; then
echo "::warning title=Contribution check failed::CHANGELOG.md must be updated!"
echo "::warning title=CHEANGELOG check failed::CHANGELOG.md must be updated!"
exit 1
fi
shell: bash

# check if jobs can be skipped
check-skippable-changes:
name: Check skippable changes
runs-on: ubuntu-latest
Expand All @@ -49,28 +40,17 @@ jobs:
paths_ignore: '["**.md"]'
skip_after_successful_duplicate: 'true'

build-test-humble:
test:
needs: check-skippable-changes
if: ${{ needs.check-skippable-changes.outputs.skip != 'true' }}
runs-on: ubuntu-latest
name: Humble build and test
name: Run tests
steps:
# First check out the repository
- name: Checkout
- name: Checkout repository
uses: actions/checkout@v3
# Load the repository build-test action
- name: Build and Test
uses: ./.github/actions/build-test-humble

build-test-humble-devel:
needs: check-skippable-changes
if: ${{ needs.check-skippable-changes.outputs.skip != 'true' }}
runs-on: ubuntu-latest
name: Humble development build and test
steps:
# First check out the repository
- name: Checkout
uses: actions/checkout@v2
# Load the repository build-test action
- name: Build and Test
uses: ./.github/actions/build-test-humble-devel
- name: Test
run: |
DOCKER_BUILDKIT=1 docker build --target test .
shell: bash

1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Release Versions:
- build: unify dockerfiles and add vs code configuration (#50)
- feat: add on_step_callback for component (#51)
- build: use iron as ros2 distro (#53)
- ci: change test workflow to docker build (#55)

## 3.0.0

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.4
3.0.5
2 changes: 1 addition & 1 deletion doxygen/doxygen.conf
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = "Modulo"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 3.0.4
PROJECT_NUMBER = 3.0.5

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
2 changes: 1 addition & 1 deletion source/modulo_component_interfaces/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>modulo_component_interfaces</name>
<version>3.0.4</version>
<version>3.0.5</version>
<description>Interface package for communicating with modulo components through the ROS framework</description>
<maintainer email="enrico@aica.tech">Enrico Eberhard</maintainer>
<license>GPLv3</license>
Expand Down
2 changes: 1 addition & 1 deletion source/modulo_components/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>modulo_components</name>
<version>3.0.4</version>
<version>3.0.5</version>
<description>Modulo base classes that wrap ROS2 Nodes as modular components for the AICA application framework</description>
<maintainer email="baptiste@aica.tech">Baptiste Busch</maintainer>
<maintainer email="enrico@aica.tech">Enrico Eberhard</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion source/modulo_core/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>modulo_core</name>
<version>3.0.4</version>
<version>3.0.5</version>
<description>Modulo Core communication and translation utilities for interoperability with AICA Control Libraries</description>
<maintainer email="baptiste@aica.tech">Baptiste Busch</maintainer>
<maintainer email="enrico@aica.tech">Enrico Eberhard</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion source/modulo_utils/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>modulo_utils</name>
<version>3.0.4</version>
<version>3.0.5</version>
<description>Modulo utils package for shared test fixtures</description>
<maintainer email="dominic@aica.tech">Dominic Reber</maintainer>
<license>GPLv3</license>
Expand Down