From 3ac01584ddca18fdf7a74698d25c5ce183389742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eirik=20Kol=C3=A5s?= Date: Mon, 9 Oct 2023 18:25:01 +0200 Subject: [PATCH] fixed distro --- .github/workflows/docker-image.yml | 13 +++++++------ .github/workflows/docker-publish.yml | 6 ++++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index fad1ea7b..a702c856 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,14 +1,15 @@ name: ouster-ros on: - push: - branches: - - ros2 workflow_dispatch: - pull_request: - branches: - - ros2 + # push: + # branches: + # - ros2 + + # pull_request: + # branches: + # - ros2 jobs: build: diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 3ac681cd..284575b9 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -20,9 +20,9 @@ jobs: fail-fast: false matrix: ros_distro: - - rolling + # - rolling - humble - - iron + # - iron permissions: contents: read @@ -61,6 +61,8 @@ jobs: with: context: . file: Dockerfile + build-args: | + ROS_DISTRO=${{ matrix.ros_distro }} push: ${{ github.event_name != 'pull_request' }} tags: ${{ env.REGISTRY }}/${{ env.REGISTRY_IMAGE }}-${{ matrix.ros_distro }}:${{ steps.date.outputs.date }} labels: ${{ steps.meta.outputs.labels }}