Merge pull request #58 from marrts/build-dockers

Added a docker commit env variable to CI so there's something to push
tesseract-robotics · Jul 11, 2023 · b421fd9 · b421fd9
2 parents aa9597e + 7214be8
commit b421fd9
Showing 1 changed file with 17 additions and 16 deletions.
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -19,20 +19,7 @@ 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' }}
@@ -81,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: |
@@ -94,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' }}