Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
rafal-gorecki committed Dec 13, 2024
1 parent 98afb18 commit 1bd4ffc
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/release-candidate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-project.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion docker/demo/compose.hardware.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions docker/demo/compose.rviz.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/demo/compose.simulation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1bd4ffc

Please sign in to comment.