From 1bd4ffc5d1dac1f28834e38007a98795080a8d8e Mon Sep 17 00:00:00 2001 From: rafal-gorecki Date: Fri, 13 Dec 2024 16:36:38 +0100 Subject: [PATCH] Fix --- .github/workflows/build-docker.yaml | 4 ++-- .github/workflows/release-candidate.yaml | 3 ++- .github/workflows/release-project.yaml | 2 +- docker/demo/compose.hardware.yaml | 2 +- docker/demo/compose.rviz.yaml | 4 ++-- docker/demo/compose.simulation.yaml | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml index e2d3c64c..412b7c57 100644 --- a/.github/workflows/build-docker.yaml +++ b/.github/workflows/build-docker.yaml @@ -56,10 +56,10 @@ jobs: fail-fast: false matrix: include: - - dockerfile: docker/Dockerfile.hardware + - dockerfile: ./docker/Dockerfile.hardware platforms: linux/arm64 ros_distro: humble - - dockerfile: docker/Dockerfile.simulation + - dockerfile: ./docker/Dockerfile.simulation repo_name: panther-gazebo platforms: linux/amd64 ros_distro: humble diff --git a/.github/workflows/release-candidate.yaml b/.github/workflows/release-candidate.yaml index 7fd3808c..2fb83de2 100644 --- a/.github/workflows/release-candidate.yaml +++ b/.github/workflows/release-candidate.yaml @@ -35,7 +35,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Run unit tests - run: echo "Unit tests for panther_ros are not fully implemented yet -> SKIPPING!" + run: echo "Unit tests are not fully implemented yet -> SKIPPING!" docker: name: Docker @@ -49,6 +49,7 @@ jobs: with: cmd: | sed -i 's/\(husarion\/panther:humble-\)[^[:space:]]*/\1${{ env.RC_BRANCH_NAME }}/g' docker/demo/compose.hardware.yaml + sed -i 's/\(husarion\/panther:humble-\)[^[:space:]]*/\1${{ env.RC_BRANCH_NAME }}/g' docker/demo/compose.rviz.yaml sed -i 's/\(husarion\/panther-gazebo:humble-\)[^[:space:]]*/\1${{ env.RC_BRANCH_NAME }}/g' docker/demo/compose.simulation.yaml - name: Commit changes diff --git a/.github/workflows/release-project.yaml b/.github/workflows/release-project.yaml index 1b2ac929..cc1b846d 100644 --- a/.github/workflows/release-project.yaml +++ b/.github/workflows/release-project.yaml @@ -34,7 +34,7 @@ jobs: name: Release project runs-on: ubuntu-22.04 steps: - - name: Release panther_ros repository + - name: Release repository uses: ./.github/workflows/release-repository.yaml with: release_candidate: ${{ env.RC_BRANCH_NAME }} diff --git a/docker/demo/compose.hardware.yaml b/docker/demo/compose.hardware.yaml index a0c53aeb..6e2a936e 100644 --- a/docker/demo/compose.hardware.yaml +++ b/docker/demo/compose.hardware.yaml @@ -7,7 +7,7 @@ x-common-config: &common-config services: husarion_ugv_ros: - image: husarion/panther:humble-2.2.0-20241213 + image: husarion/panther:humble-2.1.2-20241125 container_name: husarion_ugv_ros <<: *common-config devices: diff --git a/docker/demo/compose.rviz.yaml b/docker/demo/compose.rviz.yaml index 2d793b1f..d59c5b72 100644 --- a/docker/demo/compose.rviz.yaml +++ b/docker/demo/compose.rviz.yaml @@ -16,9 +16,9 @@ x-gpu-config: env_file: .env.gpu services: - rviz2: + rviz: image: husarion/panther:humble-2.1.2-20241125 - container_name: rviz2 + container_name: rviz <<: - *common-config - *cpu-config diff --git a/docker/demo/compose.simulation.yaml b/docker/demo/compose.simulation.yaml index d2c0db6f..b08c511d 100644 --- a/docker/demo/compose.simulation.yaml +++ b/docker/demo/compose.simulation.yaml @@ -14,7 +14,7 @@ x-gpu-config: &gpu-config services: panther_gazebo: - image: husarion/panther-gazebo:humble-2.2.0-20241213 + image: husarion/panther-gazebo:humble-2.1.2-20241125 container_name: panther_gazebo <<: - *common-config