Merge branch '2.2.0-20240227' of https://github.com/husarion/panther_ros

into ros2-devel
husarion · Feb 28, 2025 · f5d04ae · f5d04ae
2 parents c652310 + ee283b3
commit f5d04ae
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/release-candidate.yaml b/.github/workflows/release-candidate.yaml
@@ -106,5 +106,6 @@ jobs:
           ref: ${{ env.RC_BRANCH_NAME }}
           client_payload: |
             {
+              "dev_image": "true",
               "image_tag": "${{ inputs.version }}"
             }
diff --git a/.github/workflows/release-project.yaml b/.github/workflows/release-project.yaml
@@ -39,6 +39,7 @@ jobs:
       release_name: ${{ inputs.release_name }}
       automatic_mode: ${{ inputs.automatic_mode }}
       prerelease: ${{ inputs.prerelease }}
+    secrets: inherit
 
   build_docker:
     name: Build Docker
@@ -57,6 +58,7 @@ jobs:
       target_distro: humble
       target_release: ${{ inputs.version }}
       target_date: ${{ inputs.date }}
+    secrets: inherit
 
   release_project:
     name: Release project
@@ -106,6 +108,7 @@ jobs:
           ref: ${{ env.MAIN_BRANCH }}
           client_payload: |
             {
+              "dev_image": "false",
               "image_tag": "${{ inputs.version }}"
             }
 

diff --git 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/husarion-ugv:humble-2.1.2-20241125
+    image: husarion/husarion-ugv:humble-2.2.0-20240227
     container_name: husarion_ugv_ros
     <<: *common-config
     devices:

diff --git a/docker/demo/compose.rviz.yaml b/docker/demo/compose.rviz.yaml
@@ -18,7 +18,7 @@ x-gpu-config:
 
 services:
   rviz:
-    image: husarion/husarion-ugv:humble-2.1.2-20241125
+    image: husarion/husarion-ugv:humble-2.2.0-20240227
     container_name: rviz
     <<:
       - *common-config

diff --git a/docker/demo/compose.simulation.yaml b/docker/demo/compose.simulation.yaml
@@ -16,7 +16,7 @@ x-gpu-config: &gpu-config
 
 services:
   husarion_ugv_gazebo:
-    image: husarion/husarion-ugv-gazebo:humble-2.1.2-20241125
+    image: husarion/husarion-ugv-gazebo:humble-2.2.0-20240227
     container_name: husarion_ugv_gazebo
     <<:
       - *common-config