From b8afb052c5045aee3ecdd01658b454d9cd8bb38c Mon Sep 17 00:00:00 2001 From: Tyler Marr Date: Mon, 10 Jul 2023 15:37:37 -0500 Subject: [PATCH 1/2] Added a docker commit env variable to CI so there's something to push --- .github/workflows/ubuntu.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 993a4081..e1056100 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -36,6 +36,7 @@ jobs: REGISTRY: ghcr.io IMAGE_NAME: ${{ github.repository }} PUSH_DOCKER_IMAGE: ${{ github.ref == 'refs/heads/master' || github.event_name == 'release' }} + DOCKER_COMMIT: ${{ steps.meta.outputs.tags }} steps: - uses: actions/checkout@v1 From 7214be8224d3e646f140f68d1f15d06427d124e9 Mon Sep 17 00:00:00 2001 From: Tyler Marr Date: Mon, 10 Jul 2023 15:50:10 -0500 Subject: [PATCH 2/2] Reorganized Ubuntu CI file to include tag in docker commit --- .github/workflows/ubuntu.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index e1056100..8db25fd5 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -19,24 +19,10 @@ jobs: distro: [foxy, humble, rolling] env: CI_NAME: ${{ matrix.distro }}-Build - OS_NAME: ubuntu - ROS_DISTRO: ${{ matrix.distro }} - ROS_REPO: main - BEFORE_INIT: './.add-gazebo-ppa' - UPSTREAM_WORKSPACE: 'dependencies_unstable.repos' - ROSDEP_SKIP_KEYS: "catkin taskflow fcl gz-common5 gz-math7 gz-rendering7" - ADDITIONAL_DEBS: "libgz-common5-dev libgz-math7-dev libgz-rendering7-dev" - DOCKER_IMAGE: "ros:${{ matrix.distro }}" - PARALLEL_TESTS: false - NOT_TEST_BUILD: true - BEFORE_RUN_TARGET_TEST_EMBED: "source /root/target_ws/install/local_setup.bash" CCACHE_DIR: "/home/runner/work/tesseract_ros2/tesseract_ros2/${{ matrix.distro }}-Build/.ccache" - UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release" - TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug" REGISTRY: ghcr.io IMAGE_NAME: ${{ github.repository }} PUSH_DOCKER_IMAGE: ${{ github.ref == 'refs/heads/master' || github.event_name == 'release' }} - DOCKER_COMMIT: ${{ steps.meta.outputs.tags }} steps: - uses: actions/checkout@v1 @@ -82,8 +68,8 @@ jobs: prefix= suffix= tags: | - type=ref,event=branch,prefix=${{ env.ROS_DISTRO }}- - type=semver,pattern={{major}}.{{minor}},prefix=${{ env.ROS_DISTRO }}- + type=ref,event=branch,prefix=${{ matrix.distro }}- + type=semver,pattern={{major}}.{{minor}},prefix=${{ matrix.distro }}- - name: Set build type run: | @@ -95,7 +81,21 @@ jobs: fi - uses: 'ros-industrial/industrial_ci@master' - env: ${{env}} + env: + OS_NAME: ubuntu + ROS_DISTRO: ${{ matrix.distro }} + ROS_REPO: main + BEFORE_INIT: './.add-gazebo-ppa' + UPSTREAM_WORKSPACE: 'dependencies_unstable.repos' + ROSDEP_SKIP_KEYS: "catkin taskflow fcl gz-common5 gz-math7 gz-rendering7" + ADDITIONAL_DEBS: "libgz-common5-dev libgz-math7-dev libgz-rendering7-dev" + DOCKER_IMAGE: "ros:${{ matrix.distro }}" + PARALLEL_TESTS: false + NOT_TEST_BUILD: true + BEFORE_RUN_TARGET_TEST_EMBED: "source /root/target_ws/install/local_setup.bash" + UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release" + TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug" + DOCKER_COMMIT: ${{ steps.meta.outputs.tags }} - name: Push post-build Docker if: ${{ env.PUSH_DOCKER_IMAGE == 'true' }}