From 4edf6e402e5b37bf312923141f37fc5bd10035f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Mon, 23 Jun 2025 09:54:42 +0200 Subject: [PATCH] Use new windows workflow (#358) (cherry picked from commit 33a13d6ec44e00dc5fef28e203b25aac1b315264) --- .github/workflows/humble-binary-build-win.yml | 34 ------------------ .github/workflows/jazzy-binary-build-win.yml | 35 ------------------- .../workflows/rolling-binary-build-win.yml | 5 ++- 3 files changed, 2 insertions(+), 72 deletions(-) delete mode 100644 .github/workflows/humble-binary-build-win.yml delete mode 100644 .github/workflows/jazzy-binary-build-win.yml diff --git a/.github/workflows/humble-binary-build-win.yml b/.github/workflows/humble-binary-build-win.yml deleted file mode 100644 index 2f1ea0f5..00000000 --- a/.github/workflows/humble-binary-build-win.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: Humble Windows Binary Build -# author: Christoph Fröhlich -# description: 'Build & test all dependencies from released (binary) windows packages.' - -on: - workflow_dispatch: - pull_request: - branches: - - humble - # types: - # - labeled - push: - branches: - - humble - # issue_comment: - # types: - # - created - -concurrency: - # cancel previous runs of the same workflow, except for pushes on humble branch - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }} - -jobs: - binary-windows: - # if: | - # (github.event_name == 'issue_comment' && contains(github.event.comment.body, '/check-windows')) || - # (github.event_name == 'pull_request' && contains(github.event.label.name, 'check-windows')) || - # (github.event_name == 'workflow_dispatch') - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-win-build.yml@master - with: - ros_distro: humble - ref_for_scheduled_build: humble - os_name: windows-2019 diff --git a/.github/workflows/jazzy-binary-build-win.yml b/.github/workflows/jazzy-binary-build-win.yml deleted file mode 100644 index e72a9922..00000000 --- a/.github/workflows/jazzy-binary-build-win.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: Jazzy Windows Binary Build -# author: Christoph Fröhlich -# description: 'Build & test all dependencies from released (binary) windows packages.' - -on: - workflow_dispatch: - pull_request: - branches: - - jazzy - # types: - # - labeled - push: - branches: - - jazzy - # issue_comment: - # types: - # - created - -concurrency: - # cancel previous runs of the same workflow, except for pushes on jazzy branch - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }} - -jobs: - binary-windows: - # if: | - # (github.event_name == 'issue_comment' && contains(github.event.comment.body, '/check-windows')) || - # (github.event_name == 'pull_request' && contains(github.event.label.name, 'check-windows')) || - # (github.event_name == 'workflow_dispatch') - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-win-build.yml@master - with: - ros_distro: jazzy - ref_for_scheduled_build: jazzy - os_name: windows-2019 - install_boost: true diff --git a/.github/workflows/rolling-binary-build-win.yml b/.github/workflows/rolling-binary-build-win.yml index e1bd5b74..99f9f2c7 100644 --- a/.github/workflows/rolling-binary-build-win.yml +++ b/.github/workflows/rolling-binary-build-win.yml @@ -29,7 +29,6 @@ jobs: # (github.event_name == 'workflow_dispatch') uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-win-build.yml@master with: - ros_distro: jazzy # no pre-compiled rolling version is available + ros_distro: rolling ref_for_scheduled_build: master - os_name: windows-2019 - install_boost: true + pixi_dependencies: boost compilers