diff --git a/.github/workflows/identify-ros-distro.yml b/.github/workflows/identify-ros-distro.yml index fcf8f7f0..971d094f 100644 --- a/.github/workflows/identify-ros-distro.yml +++ b/.github/workflows/identify-ros-distro.yml @@ -11,10 +11,9 @@ on: value: ${{ jobs.identify-ros-distro.outputs.linuxos }} env: ROLLING_VAR: ${{ contains(github.ref, 'develop') }} + JAZZY_VAR: ${{ contains(github.ref, 'jazzy') }} IRON_VAR: ${{ contains(github.ref, 'iron') }} HUMBLE_VAR: ${{ contains(github.ref, 'humble') }} - GALACTIC_VAR: ${{ contains(github.ref, 'galactic') }} - FOXY_VAR: ${{ contains(github.ref, 'foxy') }} jobs: identify-ros-distro: @@ -28,21 +27,18 @@ jobs: run: | if ${ROLLING_VAR} == true; then echo "::set-output name=distro::rolling" - echo "::set-output name=linuxos::ubuntu-22.04" + echo "::set-output name=linuxos::ubuntu-24.04" + elif ${JAZZY_VAR} == true; then + echo "::set-output name=distro::jazzy" + echo "::set-output name=linuxos::ubuntu-24.04" elif ${IRON_VAR} == true; then echo "::set-output name=distro::iron" echo "::set-output name=linuxos::ubuntu-22.04" elif ${HUMBLE_VAR} == true; then echo "::set-output name=distro::humble" echo "::set-output name=linuxos::ubuntu-22.04" - elif ${GALACTIC_VAR} == true; then - echo "::set-output name=distro::galactic" - echo "::set-output name=linuxos::ubuntu-20.04" - elif ${FOXY_VAR} == true; then - echo "::set-output name=distro::foxy" - echo "::set-output name=linuxos::ubuntu-20.04" else echo "Unable to map branch name to ROS distro, using ROLLING as default" echo "::set-output name=distro::rolling" - echo "::set-output name=linuxos::ubuntu-22.04" + echo "::set-output name=linuxos::ubuntu-24.04" fi diff --git a/.github/workflows/linux-build-and-test-compatibility.yml b/.github/workflows/linux-build-and-test-compatibility.yml index 4c150999..5820a7f5 100644 --- a/.github/workflows/linux-build-and-test-compatibility.yml +++ b/.github/workflows/linux-build-and-test-compatibility.yml @@ -11,23 +11,24 @@ jobs: matrix: node-version: [18.X, 20.X] ros_distribution: + - jazzy - iron - humble - rolling steps: - name: Setup ROS2 - uses: ros-tooling/setup-ros@v0.7 + uses: ros-tooling/setup-ros@0.7.6 with: required-ros-distributions: ${{ matrix.ros_distribution }} - name: Install test-msgs on Linux run: | sudo apt install ros-${{ matrix.ros_distribution }}-test-msgs - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} diff --git a/.github/workflows/linux-build-and-test.yml b/.github/workflows/linux-build-and-test.yml index cd88a5dd..bd941f5d 100644 --- a/.github/workflows/linux-build-and-test.yml +++ b/.github/workflows/linux-build-and-test.yml @@ -5,17 +5,15 @@ on: push: branches: - develop + - jazzy - iron-irwini - humble-hawksbill - - galactic-geochelone - - foxy-fitzroy pull_request: branches: - develop + - jazzy - iron-irwini - humble-hawksbill - - galactic-geochelone - - foxy-fitzroy workflow_dispatch: jobs: @@ -31,12 +29,12 @@ jobs: node-version: [18.X, 20.X] steps: - name: Setup Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} - name: Setup ROS2 - uses: ros-tooling/setup-ros@v0.7 + uses: ros-tooling/setup-ros@0.7.6 with: required-ros-distributions: ${{ needs.identify-ros-distro.outputs.distro }} diff --git a/.github/workflows/windows-build-and-test-compatibility.yml b/.github/workflows/windows-build-and-test-compatibility.yml index b1e15ec5..45bb4b8f 100644 --- a/.github/workflows/windows-build-and-test-compatibility.yml +++ b/.github/workflows/windows-build-and-test-compatibility.yml @@ -12,17 +12,18 @@ jobs: matrix: node-version: [18.16.0, 20.X] ros_distribution: + - jazzy - iron - humble - rolling steps: - name: Setup Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} - name: Setup ROS2 - uses: ros-tooling/setup-ros@v0.7 + uses: ros-tooling/setup-ros@0.7.6 with: required-ros-distributions: ${{ matrix.ros_distribution }} @@ -36,7 +37,7 @@ jobs: - name: Prebuild - Setup VS Dev Environment uses: seanmiddleditch/gha-setup-vsdevenv@v4 - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build rclnodejs shell: cmd diff --git a/.github/workflows/windows-build-and-test.yml b/.github/workflows/windows-build-and-test.yml index 44779a90..6f20fb17 100644 --- a/.github/workflows/windows-build-and-test.yml +++ b/.github/workflows/windows-build-and-test.yml @@ -5,17 +5,15 @@ on: push: branches: - develop + - jazzy - iron-irwini - humble-hawksbill - - galactic-geochelone - - foxy-fitzroy pull_request: branches: - develop + - jazzy - iron-irwini - humble-hawksbill - - galactic-geochelone - - foxy-fitzroy workflow_dispatch: jobs: @@ -33,12 +31,12 @@ jobs: node-version: [18.16.0, 20.X] steps: - name: Setup Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} - name: Setup ROS2 - uses: ros-tooling/setup-ros@v0.7 + uses: ros-tooling/setup-ros@0.7.6 with: required-ros-distributions: ${{ needs.identify-ros-distro.outputs.distro }} @@ -52,7 +50,7 @@ jobs: - name: Prebuild - Setup VS Dev Environment uses: seanmiddleditch/gha-setup-vsdevenv@v4 - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build rclnodejs shell: cmd