diff --git a/.github/workflows/ros.yml b/.github/workflows/ros.yml index ce638bd..ae73de7 100644 --- a/.github/workflows/ros.yml +++ b/.github/workflows/ros.yml @@ -24,18 +24,17 @@ jobs: uses: ika-rwth-aachen/docker-ros@${{ github.event.inputs.docker-ros-git-ref }} with: '{ "base-image": "rwthika/ros:latest", "command": "roscore", "platform": "amd64", "target": "dev,run", "build-context": "ros1", "image-tag": "ros1", "enable-industrial-ci": "true"}' - # TODO: re-enable once docker-ros action is on main - # - name: docker-ros - # if: ${{ github.event_name == 'push' }} - # uses: ika-rwth-aachen/docker-ros@main - # with: - # base-image: rwthika/ros:latest - # command: roscore - # platform: amd64,arm64 - # target: dev,run - # build-context: ros1 - # image-tag: ros1 - # enable-industrial-ci: true + - name: docker-ros + if: ${{ github.event_name == 'push' }} + uses: ika-rwth-aachen/docker-ros@main + with: + base-image: rwthika/ros:latest + command: roscore + platform: amd64,arm64 + target: dev,run + build-context: ros1 + image-tag: ros1 + enable-industrial-ci: true advanced: name: advanced @@ -53,16 +52,15 @@ jobs: uses: ika-rwth-aachen/docker-ros@${{ github.event.inputs.docker-ros-git-ref }} with: '{ "base-image": "rwthika/ros:latest", "command": "roscore", "platform": "${{ matrix.platform }}", "target": "${{ matrix.target }}", "build-context": "ros1", "image-tag": "ros1", "enable-industrial-ci": "true", "enable-singlearch-push": "true"}' - # TODO: re-enable once docker-ros action is on main - # - name: docker-ros - # if: ${{ github.event_name == 'push' }} - # uses: ika-rwth-aachen/docker-ros@main - # with: - # base-image: rwthika/ros:latest - # command: roscore - # platform: ${{ matrix.platform }} - # target: ${{ matrix.target }} - # build-context: ros1 - # image-tag: ros1 - # enable-industrial-ci: true - # enable-singlearch-push: true + - name: docker-ros + if: ${{ github.event_name == 'push' }} + uses: ika-rwth-aachen/docker-ros@main + with: + base-image: rwthika/ros:latest + command: roscore + platform: ${{ matrix.platform }} + target: ${{ matrix.target }} + build-context: ros1 + image-tag: ros1 + enable-industrial-ci: true + enable-singlearch-push: true diff --git a/.github/workflows/ros2.yml b/.github/workflows/ros2.yml index de1fd7c..787c87c 100644 --- a/.github/workflows/ros2.yml +++ b/.github/workflows/ros2.yml @@ -24,18 +24,17 @@ jobs: uses: ika-rwth-aachen/docker-ros@${{ github.event.inputs.docker-ros-git-ref }} with: '{ "base-image": "rwthika/ros2:latest", "command": "ros2 topic list", "platform": "amd64", "target": "dev,run", "build-context": "ros2", "image-tag": "ros2", "enable-industrial-ci": "true"}' - # TODO: re-enable once docker-ros action is on main - # - name: docker-ros - # if: ${{ github.event_name == 'push' }} - # uses: ika-rwth-aachen/docker-ros@main - # with: - # base-image: rwthika/ros2:latest - # command: ros2 topic list - # platform: amd64 - # target: dev,run - # build-context: ros2 - # image-tag: ros2 - # enable-industrial-ci: true + - name: docker-ros + if: ${{ github.event_name == 'push' }} + uses: ika-rwth-aachen/docker-ros@main + with: + base-image: rwthika/ros2:latest + command: ros2 topic list + platform: amd64 + target: dev,run + build-context: ros2 + image-tag: ros2 + enable-industrial-ci: true advanced: name: advanced @@ -53,16 +52,15 @@ jobs: uses: ika-rwth-aachen/docker-ros@${{ github.event.inputs.docker-ros-git-ref }} with: '{ "base-image": "rwthika/ros2:latest", "command": "ros2 topic list", "platform": "${{ matrix.platform }}", "target": "${{ matrix.target }}", "build-context": "ros2", "image-tag": "ros2", "enable-industrial-ci": "true", "enable-singlearch-push": "true"}' - # TODO: re-enable once docker-ros action is on main - # - name: docker-ros - # if: ${{ github.event_name == 'push' }} - # uses: ika-rwth-aachen/docker-ros@main - # with: - # base-image: rwthika/ros2:latest - # command: ros2 topic list - # platform: ${{ matrix.platform }} - # target: ${{ matrix.target }} - # build-context: ros2 - # image-tag: ros2 - # enable-industrial-ci: true - # enable-singlearch-push: true + - name: docker-ros + if: ${{ github.event_name == 'push' }} + uses: ika-rwth-aachen/docker-ros@main + with: + base-image: rwthika/ros2:latest + command: ros2 topic list + platform: ${{ matrix.platform }} + target: ${{ matrix.target }} + build-context: ros2 + image-tag: ros2 + enable-industrial-ci: true + enable-singlearch-push: true \ No newline at end of file