diff --git a/.github/workflows/bloom-release.yml b/.github/workflows/bloom-release.yml index dabc541d..2ba15b3c 100644 --- a/.github/workflows/bloom-release.yml +++ b/.github/workflows/bloom-release.yml @@ -22,7 +22,7 @@ jobs: - name: Release ROS 2 uses: at-wat/bloom-release-action@v0 with: - ros_distro: humble iron jazzy + ros_distro: humble jazzy github_token_bloom: ${{ secrets.GH_TOKEN_FOR_BLOOM_RELEASE }} github_user: jpbusch git_user: Jean-Pierre Busch diff --git a/.github/workflows/docker-ros.yml b/.github/workflows/docker-ros.yml index fdda99b4..398c44a4 100644 --- a/.github/workflows/docker-ros.yml +++ b/.github/workflows/docker-ros.yml @@ -30,19 +30,6 @@ jobs: enable-industrial-ci: 'true' enable-recursive-vcs-import: 'false' - ros2-iron: - runs-on: ubuntu-latest - steps: - - uses: ika-rwth-aachen/docker-ros@main - with: - platform: amd64 - target: dev,run - image-tag: ros2-iron - base-image: rwthika/ros2:iron - command: ros2 launch etsi_its_conversion converter.launch.py - enable-industrial-ci: 'true' - enable-recursive-vcs-import: 'false' - ros2-jazzy: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/industrial_ci.yml b/.github/workflows/industrial_ci.yml index 65660df0..669c429c 100644 --- a/.github/workflows/industrial_ci.yml +++ b/.github/workflows/industrial_ci.yml @@ -11,7 +11,6 @@ jobs: ROS_DISTRO: - noetic - humble - - iron - jazzy ROS_REPO: - testing diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 41f0de6d..63318edd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,20 +33,6 @@ ros2-humble: ENABLE_INDUSTRIAL_CI: 'true' ENABLE_RECURSIVE_VCS_IMPORT: 'false' -ros2-iron: - trigger: - include: - - remote: https://raw.githubusercontent.com/ika-rwth-aachen/docker-ros/main/.gitlab-ci/docker-ros.yml - strategy: depend - variables: - PLATFORM: amd64,arm64 - TARGET: dev,run - IMAGE_TAG: ros2-iron - BASE_IMAGE: rwthika/ros2:iron - COMMAND: ros2 launch etsi_its_conversion converter.launch.py - ENABLE_INDUSTRIAL_CI: 'true' - ENABLE_RECURSIVE_VCS_IMPORT: 'false' - ros2-jazzy: trigger: include: diff --git a/README.md b/README.md index 1f74bb2a..1e528f63 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ - +