diff --git a/.github/workflows/reusable-ros-tooling-source-build.yml b/.github/workflows/reusable-ros-tooling-source-build.yml index ebdd5bf..612cc6a 100644 --- a/.github/workflows/reusable-ros-tooling-source-build.yml +++ b/.github/workflows/reusable-ros-tooling-source-build.yml @@ -15,7 +15,7 @@ on: type: string ros2_repo_branch: description: 'Branch in the ros2/ros2 repository from which ".repos" should be used. Possible values: master (Rolling), humble, jazzy.' - default: 'master' + default: 'main' required: false type: string @@ -32,7 +32,7 @@ jobs: - uses: actions/checkout@v4 with: ref: ${{ inputs.ref }} - - uses: ros-tooling/action-ros-ci@v0.3 + - uses: ros-tooling/action-ros-ci@v0.4.8 with: target-ros2-distro: ${{ inputs.ros_distro }} # build all packages listed in the meta package @@ -43,7 +43,7 @@ jobs: https://raw.githubusercontent.com/ros2/ros2/${{ inputs.ros2_repo_branch }}/ros2.repos https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/picknik_controllers.${{ inputs.ros_distro }}.repos?token=${{ secrets.GITHUB_TOKEN }} colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 with: name: colcon-logs-ubuntu-24.04 path: ros_ws/log diff --git a/.github/workflows/rolling-abi-compatibility.yml b/.github/workflows/rolling-abi-compatibility.yml index be39cde..7a204f5 100644 --- a/.github/workflows/rolling-abi-compatibility.yml +++ b/.github/workflows/rolling-abi-compatibility.yml @@ -11,7 +11,7 @@ jobs: abi_check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: ros-industrial/industrial_ci@master env: ROS_DISTRO: rolling diff --git a/.github/workflows/rolling-binary-build-testing.yml b/.github/workflows/rolling-binary-build-testing.yml index bf9ace9..d325276 100644 --- a/.github/workflows/rolling-binary-build-testing.yml +++ b/.github/workflows/rolling-binary-build-testing.yml @@ -21,6 +21,6 @@ jobs: uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml with: ros_distro: rolling - ros_repo: testing + ros_repo: main upstream_workspace: picknik_controllers-not-released.rolling.repos ref_for_scheduled_build: main diff --git a/.github/workflows/rolling-semi-binary-build-testing.yml b/.github/workflows/rolling-semi-binary-build-testing.yml index e5754af..11ddc72 100644 --- a/.github/workflows/rolling-semi-binary-build-testing.yml +++ b/.github/workflows/rolling-semi-binary-build-testing.yml @@ -20,6 +20,6 @@ jobs: uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml with: ros_distro: rolling - ros_repo: testing + ros_repo: main upstream_workspace: picknik_controllers.rolling.repos ref_for_scheduled_build: main