From 3bc3ce13289999ed032825cf98076254d0171ec2 Mon Sep 17 00:00:00 2001 From: Frederik Pasch Date: Thu, 2 Jan 2025 11:02:18 +0100 Subject: [PATCH 01/22] Update runner --- .github/linters/actionlint.yml | 2 +- .github/workflows/cleanup_cache.yml | 2 +- .github/workflows/doc.yml | 4 ++-- .github/workflows/image.yml | 4 ++-- .github/workflows/scan.yml | 8 +++---- .github/workflows/scorecard.yml | 2 +- .github/workflows/test_build.yml | 34 ++++++++++++++--------------- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/linters/actionlint.yml b/.github/linters/actionlint.yml index 58884e3d..2222cefb 100644 --- a/.github/linters/actionlint.yml +++ b/.github/linters/actionlint.yml @@ -1,4 +1,4 @@ --- self-hosted-runner: labels: - - intellabs-01 + - ubuntu-latest diff --git a/.github/workflows/cleanup_cache.yml b/.github/workflows/cleanup_cache.yml index abf9aa10..f719545f 100644 --- a/.github/workflows/cleanup_cache.yml +++ b/.github/workflows/cleanup_cache.yml @@ -8,7 +8,7 @@ jobs: cleanup: permissions: actions: write - runs-on: intellabs-01 + runs-on: ubuntu-latest steps: - name: Cleanup run: | diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index 19287b16..ad3f2a5f 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -20,7 +20,7 @@ permissions: read-all jobs: build_docs: name: 'Build Docs' - runs-on: intellabs-01 + runs-on: ubuntu-latest container: image: ghcr.io/sphinx-doc/sphinx:7.1.2 volumes: @@ -46,7 +46,7 @@ jobs: name: 'Deploy to GitHub Pages' needs: build_docs if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/main' }} - runs-on: intellabs-01 + runs-on: ubuntu-latest container: image: ghcr.io/sphinx-doc/sphinx:7.1.2 environment: diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml index 89491506..43fc7ea6 100644 --- a/.github/workflows/image.yml +++ b/.github/workflows/image.yml @@ -21,7 +21,7 @@ concurrency: permissions: read-all jobs: build-and-push: - runs-on: intellabs-01 + runs-on: ubuntu-latest permissions: packages: write steps: @@ -49,7 +49,7 @@ jobs: build-args: | ROS_DISTRO=${{ github.ref == 'refs/heads/main' && 'humble' || github.event.pull_request.base.ref == 'main' && 'humble' || github.event.pull_request.base.ref }} test-devcontainer: - runs-on: intellabs-01 + runs-on: ubuntu-latest permissions: packages: write steps: diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index f6a9b278..ea614b31 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -10,7 +10,7 @@ permissions: read-all jobs: lint: name: 'Super-linter' - runs-on: intellabs-01 + runs-on: ubuntu-latest container: 'ghcr.io/github/super-linter:v5.0.0' permissions: contents: read @@ -39,7 +39,7 @@ jobs: FILTER_REGEX_EXCLUDE: .*/pull_request_template.md trivy: name: Trivy - runs-on: intellabs-01 + runs-on: ubuntu-latest steps: - name: Checkout code uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1 @@ -52,7 +52,7 @@ jobs: vuln-type: 'os,library' bandit: name: Bandit - runs-on: intellabs-01 + runs-on: ubuntu-latest steps: - name: Checkout code uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1 @@ -63,7 +63,7 @@ jobs: bandit -c .github/bandit.yaml -r . license: name: License check - runs-on: intellabs-01 + runs-on: ubuntu-latest container: image: osrf/ros:humble-desktop steps: diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 39e6fafa..285eb3e3 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -22,7 +22,7 @@ permissions: read-all jobs: analysis: name: Scorecard analysis - runs-on: intellabs-01 + runs-on: ubuntu-latest permissions: # Needed to upload the results to code-scanning dashboard. security-events: write diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index 747249f8..058db561 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -11,7 +11,7 @@ permissions: read-all jobs: build: #TODO model dependency to image-workflow. Workaround: retrigger run after image-workflow finished. - runs-on: intellabs-01 + runs-on: ubuntu-latest container: image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} credentials: @@ -40,7 +40,7 @@ jobs: key: ${{ runner.os }}-build-${{ github.run_number }} test-scenario-execution: needs: [build] - runs-on: intellabs-01 + runs-on: ubuntu-latest container: image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} credentials: @@ -77,7 +77,7 @@ jobs: path: ./**/TEST.xml test-scenario-execution-ros: needs: [build] - runs-on: intellabs-01 + runs-on: ubuntu-latest container: image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} credentials: @@ -112,7 +112,7 @@ jobs: path: ./**/TEST.xml scenario-files-validation: needs: [build] - runs-on: intellabs-01 + runs-on: ubuntu-latest container: image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} credentials: @@ -135,7 +135,7 @@ jobs: done test-example-scenario: needs: [build] - runs-on: intellabs-01 + runs-on: ubuntu-latest container: image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} credentials: @@ -162,7 +162,7 @@ jobs: path: test_example_scenario/test.xml test-example-library: needs: [build] - runs-on: intellabs-01 + runs-on: ubuntu-latest container: image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} credentials: @@ -189,7 +189,7 @@ jobs: path: test_example_library/test.xml test-example-variation: needs: [build] - runs-on: intellabs-01 + runs-on: ubuntu-latest container: image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} credentials: @@ -217,7 +217,7 @@ jobs: path: test_example_variation/test.xml test-example-nav2: needs: [build] - runs-on: intellabs-01 + runs-on: ubuntu-latest container: image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} credentials: @@ -250,7 +250,7 @@ jobs: path: test_example_nav2/test.xml test-example-simulation: needs: [build] - runs-on: intellabs-01 + runs-on: ubuntu-latest container: image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} credentials: @@ -283,7 +283,7 @@ jobs: path: test_example_simulation/test.xml test-example-multirobot: needs: [build] - runs-on: intellabs-01 + runs-on: ubuntu-latest container: image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} credentials: @@ -335,7 +335,7 @@ jobs: path: test_example_multirobot/**/rosbag* test-example-external-method: needs: [build] - runs-on: intellabs-01 + runs-on: ubuntu-latest container: image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} credentials: @@ -364,7 +364,7 @@ jobs: path: test_example_external_method/test.xml test-example-moveit2: needs: [build] - runs-on: intellabs-01 + runs-on: ubuntu-latest container: image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} credentials: @@ -397,7 +397,7 @@ jobs: path: test_example_moveit2/test.xml test-scenario-execution-gazebo: needs: [build] - runs-on: intellabs-01 + runs-on: ubuntu-latest timeout-minutes: 30 container: image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} @@ -430,7 +430,7 @@ jobs: path: test_scenario_execution_gazebo/test.xml test-scenario-execution-nav2: needs: [build] - runs-on: intellabs-01 + runs-on: ubuntu-latest timeout-minutes: 30 container: image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} @@ -476,7 +476,7 @@ jobs: path: test_scenario_execution_nav2/test_scenario_execution_nav2/example_nav2.mp4 test-scenario-execution-pybullet: needs: [build] - runs-on: intellabs-01 + runs-on: ubuntu-latest timeout-minutes: 10 container: image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} @@ -506,7 +506,7 @@ jobs: path: test_scenario_execution_pybullet/test.xml test-scenario-execution-x11: needs: [build] - runs-on: intellabs-01 + runs-on: ubuntu-latest timeout-minutes: 3 container: image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} @@ -558,7 +558,7 @@ jobs: - test-scenario-execution-nav2 - test-scenario-execution-pybullet - test-scenario-execution-x11 - runs-on: intellabs-01 + runs-on: ubuntu-latest if: ${{ always() }} permissions: checks: write From 0fb327ac7ddec8c0394ba3b9c783e716246b8696 Mon Sep 17 00:00:00 2001 From: Frederik Pasch Date: Thu, 2 Jan 2025 11:20:44 +0100 Subject: [PATCH 02/22] update maintainers --- dependencies/scenario_execution_py_trees_ros/package.xml | 7 +++++-- examples/example_multi_robot/package.xml | 3 ++- examples/example_scenario_control/package.xml | 7 +++++-- examples/example_simulation/package.xml | 7 +++++-- libs/scenario_execution_docker/package.xml | 7 +++++-- libs/scenario_execution_floorplan_dsl/package.xml | 7 +++++-- libs/scenario_execution_gazebo/package.xml | 7 +++++-- libs/scenario_execution_kubernetes/package.xml | 7 +++++-- libs/scenario_execution_moveit2/package.xml | 7 +++++-- libs/scenario_execution_nav2/package.xml | 7 +++++-- libs/scenario_execution_os/package.xml | 7 +++++-- libs/scenario_execution_pybullet/package.xml | 7 +++++-- libs/scenario_execution_x11/package.xml | 7 +++++-- scenario_execution/package.xml | 7 +++++-- scenario_execution_control/package.xml | 7 +++++-- scenario_execution_coverage/package.xml | 7 +++++-- scenario_execution_interfaces/package.xml | 7 +++++-- scenario_execution_rviz/package.xml | 7 +++++-- simulation/gazebo/arm_sim_scenario/package.xml | 7 +++++-- simulation/gazebo/gazebo_static_camera/package.xml | 7 +++++-- simulation/gazebo/gazebo_tf_publisher/package.xml | 7 +++++-- simulation/gazebo/tb4_sim_scenario/package.xml | 7 +++++-- test/scenario_execution_docker_test/package.xml | 7 +++++-- test/scenario_execution_gazebo_test/package.xml | 7 +++++-- test/scenario_execution_nav2_test/package.xml | 7 +++++-- test/scenario_execution_ros_test/package.xml | 7 +++++-- test/scenario_execution_test/package.xml | 7 +++++-- tools/message_modification/package.xml | 7 +++++-- tools/scenario_status/package.xml | 7 +++++-- tools/tf_to_pose_publisher/package.xml | 7 +++++-- 30 files changed, 147 insertions(+), 59 deletions(-) diff --git a/dependencies/scenario_execution_py_trees_ros/package.xml b/dependencies/scenario_execution_py_trees_ros/package.xml index c2716902..e894e560 100644 --- a/dependencies/scenario_execution_py_trees_ros/package.xml +++ b/dependencies/scenario_execution_py_trees_ros/package.xml @@ -4,8 +4,11 @@ scenario_execution_py_trees_ros 1.2.0 Fixes in py-trees-ros not yet release - Intel Labs - Intel Labs + Intel Labs + Frederik Pasch + Florian Mirus + Frederik Pasch + Florian Mirus BSD-3-Clause py_trees_ros diff --git a/examples/example_multi_robot/package.xml b/examples/example_multi_robot/package.xml index f4556e0b..d88d0323 100644 --- a/examples/example_multi_robot/package.xml +++ b/examples/example_multi_robot/package.xml @@ -5,7 +5,8 @@ 1.2.0 Example Multi Robot Intel Labs - Intel Labs + Frederik Pasch + Florian Mirus Apache-2.0 rclpy diff --git a/examples/example_scenario_control/package.xml b/examples/example_scenario_control/package.xml index e0f5f066..608449d1 100644 --- a/examples/example_scenario_control/package.xml +++ b/examples/example_scenario_control/package.xml @@ -4,8 +4,11 @@ example_scenario_control 1.2.0 Scenario Execution Example for Scenario Control using RVIZ - Intel Labs - Intel Labs + Intel Labs + Frederik Pasch + Florian Mirus + Frederik Pasch + Florian Mirus Apache-2.0 scenario_execution_control diff --git a/examples/example_simulation/package.xml b/examples/example_simulation/package.xml index 638f4a16..9438a320 100644 --- a/examples/example_simulation/package.xml +++ b/examples/example_simulation/package.xml @@ -4,8 +4,11 @@ example_simulation 1.2.0 Scenario Execution Example for Simulation - Intel Labs - Intel Labs + Intel Labs + Frederik Pasch + Florian Mirus + Frederik Pasch + Florian Mirus Apache-2.0 scenario_execution diff --git a/libs/scenario_execution_docker/package.xml b/libs/scenario_execution_docker/package.xml index 92bafcc9..64bd62a5 100644 --- a/libs/scenario_execution_docker/package.xml +++ b/libs/scenario_execution_docker/package.xml @@ -4,8 +4,11 @@ scenario_execution_docker 1.2.0 Scenario Execution library for docker interactions - Intel Labs - Intel Labs + Intel Labs + Frederik Pasch + Florian Mirus + Frederik Pasch + Florian Mirus Apache-2.0 scenario_execution diff --git a/libs/scenario_execution_floorplan_dsl/package.xml b/libs/scenario_execution_floorplan_dsl/package.xml index 91534f7b..e8ff33e6 100644 --- a/libs/scenario_execution_floorplan_dsl/package.xml +++ b/libs/scenario_execution_floorplan_dsl/package.xml @@ -4,8 +4,11 @@ scenario_execution_floorplan_dsl 1.2.0 Scenario Execution library for Floorplan DSL - Intel Labs - Intel Labs + Intel Labs + Frederik Pasch + Florian Mirus + Frederik Pasch + Florian Mirus Apache-2.0 scenario_execution diff --git a/libs/scenario_execution_gazebo/package.xml b/libs/scenario_execution_gazebo/package.xml index 8f760801..d0b7814f 100644 --- a/libs/scenario_execution_gazebo/package.xml +++ b/libs/scenario_execution_gazebo/package.xml @@ -4,8 +4,11 @@ scenario_execution_gazebo 1.2.0 Scenario Execution library for Gazebo - Intel Labs - Intel Labs + Intel Labs + Frederik Pasch + Florian Mirus + Frederik Pasch + Florian Mirus Apache-2.0 scenario_execution_ros diff --git a/libs/scenario_execution_kubernetes/package.xml b/libs/scenario_execution_kubernetes/package.xml index 43ebc908..7fa1976c 100644 --- a/libs/scenario_execution_kubernetes/package.xml +++ b/libs/scenario_execution_kubernetes/package.xml @@ -4,8 +4,11 @@ scenario_execution_kubernetes 1.2.0 Package for scenario execution kubernetes library - Intel Labs - Intel Labs + Intel Labs + Frederik Pasch + Florian Mirus + Frederik Pasch + Florian Mirus Apache-2.0 scenario_execution diff --git a/libs/scenario_execution_moveit2/package.xml b/libs/scenario_execution_moveit2/package.xml index 9fb25b9d..e984b79a 100644 --- a/libs/scenario_execution_moveit2/package.xml +++ b/libs/scenario_execution_moveit2/package.xml @@ -4,8 +4,11 @@ scenario_execution_moveit2 1.2.0 Scenario Execution library for moveIt2 - Intel Labs - Intel Labs + Intel Labs + Frederik Pasch + Florian Mirus + Frederik Pasch + Florian Mirus Apache-2.0 scenario_execution_ros diff --git a/libs/scenario_execution_nav2/package.xml b/libs/scenario_execution_nav2/package.xml index 674bcfef..84f735ff 100644 --- a/libs/scenario_execution_nav2/package.xml +++ b/libs/scenario_execution_nav2/package.xml @@ -4,8 +4,11 @@ scenario_execution_nav2 1.2.0 Scenario Execution library for Nav2 - Intel Labs - Intel Labs + Intel Labs + Frederik Pasch + Florian Mirus + Frederik Pasch + Florian Mirus Apache-2.0 scenario_execution_ros diff --git a/libs/scenario_execution_os/package.xml b/libs/scenario_execution_os/package.xml index f5cc1d9f..77d06819 100644 --- a/libs/scenario_execution_os/package.xml +++ b/libs/scenario_execution_os/package.xml @@ -4,8 +4,11 @@ scenario_execution_os 1.2.0 Scenario Execution library for OS interactions - Intel Labs - Intel Labs + Intel Labs + Frederik Pasch + Florian Mirus + Frederik Pasch + Florian Mirus Apache-2.0 scenario_execution diff --git a/libs/scenario_execution_pybullet/package.xml b/libs/scenario_execution_pybullet/package.xml index 0c010ae9..5add1e07 100644 --- a/libs/scenario_execution_pybullet/package.xml +++ b/libs/scenario_execution_pybullet/package.xml @@ -4,8 +4,11 @@ scenario_execution_pybullet 1.2.0 Scenario Execution library for PyBullet - Intel Labs - Intel Labs + Intel Labs + Frederik Pasch + Florian Mirus + Frederik Pasch + Florian Mirus Apache-2.0 scenario_execution diff --git a/libs/scenario_execution_x11/package.xml b/libs/scenario_execution_x11/package.xml index 6903fd41..24b61909 100644 --- a/libs/scenario_execution_x11/package.xml +++ b/libs/scenario_execution_x11/package.xml @@ -4,8 +4,11 @@ scenario_execution_x11 1.2.0 Scenario Execution library for X11 - Intel Labs - Intel Labs + Intel Labs + Frederik Pasch + Florian Mirus + Frederik Pasch + Florian Mirus Apache-2.0 scenario_execution diff --git a/scenario_execution/package.xml b/scenario_execution/package.xml index f48df62e..7d4d52b2 100644 --- a/scenario_execution/package.xml +++ b/scenario_execution/package.xml @@ -4,8 +4,11 @@ scenario_execution 1.2.0 Scenario Execution - Intel Labs - Intel Labs + Intel Labs + Frederik Pasch + Florian Mirus + Frederik Pasch + Florian Mirus Apache-2.0 py_trees diff --git a/scenario_execution_control/package.xml b/scenario_execution_control/package.xml index f1b4d4ec..9ee0eb5c 100644 --- a/scenario_execution_control/package.xml +++ b/scenario_execution_control/package.xml @@ -3,8 +3,11 @@ scenario_execution_control 1.2.0 Scenario Execution Control - Intel Labs - Intel Labs + Intel Labs + Frederik Pasch + Florian Mirus + Frederik Pasch + Florian Mirus Apache-2.0 scenario_execution_interfaces diff --git a/scenario_execution_coverage/package.xml b/scenario_execution_coverage/package.xml index 07c01fdf..052b2291 100644 --- a/scenario_execution_coverage/package.xml +++ b/scenario_execution_coverage/package.xml @@ -4,8 +4,11 @@ scenario_execution_coverage 1.2.0 Robotics Scenario Execution Coverage Tools - Intel Labs - Intel Labs + Intel Labs + Frederik Pasch + Florian Mirus + Frederik Pasch + Florian Mirus Apache-2.0 scenario_execution diff --git a/scenario_execution_interfaces/package.xml b/scenario_execution_interfaces/package.xml index 4792dde5..3ba9166d 100644 --- a/scenario_execution_interfaces/package.xml +++ b/scenario_execution_interfaces/package.xml @@ -4,8 +4,11 @@ scenario_execution_interfaces 1.2.0 ROS2 Interfaces for Scenario Execution - Intel Labs - Intel Labs + Intel Labs + Frederik Pasch + Florian Mirus + Frederik Pasch + Florian Mirus Apache-2.0 ament_cmake diff --git a/scenario_execution_rviz/package.xml b/scenario_execution_rviz/package.xml index e83475c6..9a46d23d 100644 --- a/scenario_execution_rviz/package.xml +++ b/scenario_execution_rviz/package.xml @@ -3,8 +3,11 @@ scenario_execution_rviz 1.2.0 The scenario_execution_rviz package - Intel Labs - Intel Labs + Intel Labs + Frederik Pasch + Florian Mirus + Frederik Pasch + Florian Mirus Apache-2.0 MIT diff --git a/simulation/gazebo/arm_sim_scenario/package.xml b/simulation/gazebo/arm_sim_scenario/package.xml index 645b73e5..571989e3 100644 --- a/simulation/gazebo/arm_sim_scenario/package.xml +++ b/simulation/gazebo/arm_sim_scenario/package.xml @@ -4,8 +4,11 @@ arm_sim_scenario 1.2.0 MoveIt2 Arm Simulation Scenario Execution - Intel Labs - Intel Labs + Intel Labs + Frederik Pasch + Florian Mirus + Frederik Pasch + Florian Mirus Apache-2.0 ament_cmake diff --git a/simulation/gazebo/gazebo_static_camera/package.xml b/simulation/gazebo/gazebo_static_camera/package.xml index 0dd86d11..25b561a6 100644 --- a/simulation/gazebo/gazebo_static_camera/package.xml +++ b/simulation/gazebo/gazebo_static_camera/package.xml @@ -4,8 +4,11 @@ gazebo_static_camera 1.2.0 Spawn a static camera within a gazebo world - Intel Labs - Intel Labs + Intel Labs + Frederik Pasch + Florian Mirus + Frederik Pasch + Florian Mirus Apache-2.0 rclpy diff --git a/simulation/gazebo/gazebo_tf_publisher/package.xml b/simulation/gazebo/gazebo_tf_publisher/package.xml index 170b8c38..339cc872 100755 --- a/simulation/gazebo/gazebo_tf_publisher/package.xml +++ b/simulation/gazebo/gazebo_tf_publisher/package.xml @@ -6,8 +6,11 @@ Node to publish ignition ground truth TF tree - Intel Labs - Intel Labs + Intel Labs + Frederik Pasch + Florian Mirus + Frederik Pasch + Florian Mirus Apache-2.0 ament_cmake diff --git a/simulation/gazebo/tb4_sim_scenario/package.xml b/simulation/gazebo/tb4_sim_scenario/package.xml index dfc133bf..3703fb16 100644 --- a/simulation/gazebo/tb4_sim_scenario/package.xml +++ b/simulation/gazebo/tb4_sim_scenario/package.xml @@ -4,8 +4,11 @@ tb4_sim_scenario 1.2.0 TurtleBot 4 Simulation Scenario Execution - Intel Labs - Intel Labs + Intel Labs + Frederik Pasch + Florian Mirus + Frederik Pasch + Florian Mirus Apache-2.0 ament_cmake diff --git a/test/scenario_execution_docker_test/package.xml b/test/scenario_execution_docker_test/package.xml index e29c3e3a..2852a56d 100644 --- a/test/scenario_execution_docker_test/package.xml +++ b/test/scenario_execution_docker_test/package.xml @@ -4,8 +4,11 @@ scenario_execution_docker_test 1.2.0 Tests for Scenario Execution library for Docker - Intel Labs - Intel Labs + Intel Labs + Frederik Pasch + Florian Mirus + Frederik Pasch + Florian Mirus Apache-2.0 scenario_execution_docker diff --git a/test/scenario_execution_gazebo_test/package.xml b/test/scenario_execution_gazebo_test/package.xml index 3d397bdb..595d8fad 100644 --- a/test/scenario_execution_gazebo_test/package.xml +++ b/test/scenario_execution_gazebo_test/package.xml @@ -4,8 +4,11 @@ scenario_execution_gazebo_test 1.2.0 Tests for Scenario Execution library for Gazebo - Intel Labs - Intel Labs + Intel Labs + Frederik Pasch + Florian Mirus + Frederik Pasch + Florian Mirus Apache-2.0 rclpy diff --git a/test/scenario_execution_nav2_test/package.xml b/test/scenario_execution_nav2_test/package.xml index 94a0f51a..cedea9f3 100644 --- a/test/scenario_execution_nav2_test/package.xml +++ b/test/scenario_execution_nav2_test/package.xml @@ -4,8 +4,11 @@ scenario_execution_nav2_test 1.2.0 Tests for Scenario Execution library for Nav2 - Intel Labs - Intel Labs + Intel Labs + Frederik Pasch + Florian Mirus + Frederik Pasch + Florian Mirus Apache-2.0 rclpy diff --git a/test/scenario_execution_ros_test/package.xml b/test/scenario_execution_ros_test/package.xml index 57373bff..4be8e6cc 100644 --- a/test/scenario_execution_ros_test/package.xml +++ b/test/scenario_execution_ros_test/package.xml @@ -4,8 +4,11 @@ scenario_execution_ros_test 1.2.0 Tests for Scenario Execution library for ROS - Intel Labs - Intel Labs + Intel Labs + Frederik Pasch + Florian Mirus + Frederik Pasch + Florian Mirus Apache-2.0 scenario_execution_ros diff --git a/test/scenario_execution_test/package.xml b/test/scenario_execution_test/package.xml index bedd7047..82016a5a 100644 --- a/test/scenario_execution_test/package.xml +++ b/test/scenario_execution_test/package.xml @@ -4,8 +4,11 @@ scenario_execution_test 1.2.0 Tests for Scenario Execution library - Intel Labs - Intel Labs + Intel Labs + Frederik Pasch + Florian Mirus + Frederik Pasch + Florian Mirus Apache-2.0 scenario_execution diff --git a/tools/message_modification/package.xml b/tools/message_modification/package.xml index 619b833c..8a308511 100644 --- a/tools/message_modification/package.xml +++ b/tools/message_modification/package.xml @@ -3,8 +3,11 @@ message_modification 1.2.0 Modification of message data - Intel Labs - Intel Labs + Intel Labs + Frederik Pasch + Florian Mirus + Frederik Pasch + Florian Mirus Apache-2.0 sensor_msgs diff --git a/tools/scenario_status/package.xml b/tools/scenario_status/package.xml index 7c5aaa0c..26310f1f 100644 --- a/tools/scenario_status/package.xml +++ b/tools/scenario_status/package.xml @@ -9,8 +9,11 @@ changes in behaviour states as strings at the time they are \ happening - Intel Labs - Intel Labs + Intel Labs + Frederik Pasch + Florian Mirus + Frederik Pasch + Florian Mirus Apache-2.0 rclpy diff --git a/tools/tf_to_pose_publisher/package.xml b/tools/tf_to_pose_publisher/package.xml index 778eae99..f1802329 100644 --- a/tools/tf_to_pose_publisher/package.xml +++ b/tools/tf_to_pose_publisher/package.xml @@ -4,8 +4,11 @@ tf_to_pose_publisher 1.2.0 Publish a tf transform to a pose topic - Intel Labs - Intel Labs + Intel Labs + Frederik Pasch + Florian Mirus + Frederik Pasch + Florian Mirus Apache-2.0 rclpy From bbdfa6cf8b498eef0bca61da10eeb4c27b0d9111 Mon Sep 17 00:00:00 2001 From: Frederik Pasch Date: Thu, 2 Jan 2025 11:22:03 +0100 Subject: [PATCH 03/22] update images --- .github/workflows/image.yml | 2 +- .github/workflows/test_build.yml | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml index 43fc7ea6..daea485d 100644 --- a/.github/workflows/image.yml +++ b/.github/workflows/image.yml @@ -45,7 +45,7 @@ jobs: context: . file: .github/workflows/Dockerfile push: true - tags: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref || steps.extract_branch.outputs.branch }} + tags: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref || steps.extract_branch.outputs.branch }} build-args: | ROS_DISTRO=${{ github.ref == 'refs/heads/main' && 'humble' || github.event.pull_request.base.ref == 'main' && 'humble' || github.event.pull_request.base.ref }} test-devcontainer: diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index 058db561..f0ac2da2 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -13,7 +13,7 @@ jobs: #TODO model dependency to image-workflow. Workaround: retrigger run after image-workflow finished. runs-on: ubuntu-latest container: - image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} + image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }} credentials: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} @@ -42,7 +42,7 @@ jobs: needs: [build] runs-on: ubuntu-latest container: - image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} + image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }} credentials: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} @@ -79,7 +79,7 @@ jobs: needs: [build] runs-on: ubuntu-latest container: - image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} + image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }} credentials: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} @@ -114,7 +114,7 @@ jobs: needs: [build] runs-on: ubuntu-latest container: - image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} + image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }} credentials: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} @@ -137,7 +137,7 @@ jobs: needs: [build] runs-on: ubuntu-latest container: - image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} + image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }} credentials: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} @@ -164,7 +164,7 @@ jobs: needs: [build] runs-on: ubuntu-latest container: - image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} + image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }} credentials: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} @@ -191,7 +191,7 @@ jobs: needs: [build] runs-on: ubuntu-latest container: - image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} + image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }} credentials: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} @@ -219,7 +219,7 @@ jobs: needs: [build] runs-on: ubuntu-latest container: - image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} + image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }} credentials: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} @@ -252,7 +252,7 @@ jobs: needs: [build] runs-on: ubuntu-latest container: - image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} + image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }} credentials: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} @@ -285,7 +285,7 @@ jobs: needs: [build] runs-on: ubuntu-latest container: - image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} + image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }} credentials: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} @@ -337,7 +337,7 @@ jobs: needs: [build] runs-on: ubuntu-latest container: - image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} + image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }} credentials: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} @@ -366,7 +366,7 @@ jobs: needs: [build] runs-on: ubuntu-latest container: - image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} + image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }} credentials: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} @@ -400,7 +400,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 container: - image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} + image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }} credentials: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} @@ -433,7 +433,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 container: - image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} + image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }} credentials: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} @@ -479,7 +479,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 10 container: - image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} + image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }} credentials: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} @@ -509,7 +509,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 3 container: - image: ghcr.io/intellabs/scenario-execution:${{ github.event.pull_request.base.ref }} + image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }} credentials: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} From 6f41cafbcff6097d045311a8ca54190acf28804b Mon Sep 17 00:00:00 2001 From: Frederik Pasch Date: Thu, 2 Jan 2025 11:32:11 +0100 Subject: [PATCH 04/22] reduce image --- .github/workflows/scan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index ea614b31..410df9f9 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -65,7 +65,7 @@ jobs: name: License check runs-on: ubuntu-latest container: - image: osrf/ros:humble-desktop + image: ros:jazzy-ros-base steps: - name: Checkout code uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1 From 8a7880c33325785125a42fb82f605244b5d399c5 Mon Sep 17 00:00:00 2001 From: Frederik Pasch Date: Thu, 2 Jan 2025 11:33:16 +0100 Subject: [PATCH 05/22] use pipx --- .github/workflows/scan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index 410df9f9..31b9493c 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -74,7 +74,7 @@ jobs: run: | apt update apt install -y python3-pip - pip3 install ros-license-toolkit==1.2.2 + pipx install ros-license-toolkit==1.2.2 apt install -y golang-go go version go install github.com/google/addlicense@v1.1.1 From 245c11326dc6c7f2ecd6c857f7e68898f5964962 Mon Sep 17 00:00:00 2001 From: Frederik Pasch Date: Thu, 2 Jan 2025 11:34:43 +0100 Subject: [PATCH 06/22] use pipx --- .github/workflows/scan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index 31b9493c..4cdaf1f3 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -73,7 +73,7 @@ jobs: shell: bash run: | apt update - apt install -y python3-pip + apt install -y pipx pipx install ros-license-toolkit==1.2.2 apt install -y golang-go go version From 9061484c662de48f78acb3c58370e0975e65e757 Mon Sep 17 00:00:00 2001 From: Frederik Pasch Date: Thu, 2 Jan 2025 11:37:31 +0100 Subject: [PATCH 07/22] use pipx --- .github/workflows/scan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index 4cdaf1f3..3da2ed30 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -74,7 +74,7 @@ jobs: run: | apt update apt install -y pipx - pipx install ros-license-toolkit==1.2.2 + pipx install ros-license-toolkit==1.3.0 apt install -y golang-go go version go install github.com/google/addlicense@v1.1.1 From 246bce7d207fd473c4bd5d8fbf47c7f0ea399474 Mon Sep 17 00:00:00 2001 From: Frederik Pasch Date: Thu, 2 Jan 2025 11:55:40 +0100 Subject: [PATCH 08/22] add license check tools to runner image --- .github/workflows/Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/Dockerfile b/.github/workflows/Dockerfile index 9e8acdfa..a4336a25 100644 --- a/.github/workflows/Dockerfile +++ b/.github/workflows/Dockerfile @@ -9,6 +9,7 @@ RUN --mount=type=bind,source=.,target=/scenario_execution \ apt-get update && \ apt-get install -y --no-install-recommends \ python3-pip \ + pipx golang-go\ xvfb \ tk \ libgl1 && \ @@ -18,6 +19,11 @@ RUN --mount=type=bind,source=.,target=/scenario_execution \ rosdep install --rosdistro=${ROS_DISTRO} --from-paths /scenario_execution/ --ignore-src -r -y && \ rm -rf /var/lib/apt/lists/* +# install dependencies for license check +RUN pipx install ros-license-toolkit==1.3.0 && \ + go install github.com/google/addlicense@v1.1.1 + +# install pybullet dependencies RUN --mount=type=bind,source=.,target=/scenario_execution \ pip3 install --no-cache-dir -r /scenario_execution/libs/scenario_execution_pybullet/requirements.txt --break-system-packages From b8fcee37e228e8c4bc4381357afecad9a1b758cc Mon Sep 17 00:00:00 2001 From: Frederik Pasch Date: Thu, 2 Jan 2025 12:36:01 +0100 Subject: [PATCH 09/22] use pipx --- .github/workflows/Dockerfile | 2 +- .github/workflows/scan.yml | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/.github/workflows/Dockerfile b/.github/workflows/Dockerfile index a4336a25..6fcd38fd 100644 --- a/.github/workflows/Dockerfile +++ b/.github/workflows/Dockerfile @@ -20,7 +20,7 @@ RUN --mount=type=bind,source=.,target=/scenario_execution \ rm -rf /var/lib/apt/lists/* # install dependencies for license check -RUN pipx install ros-license-toolkit==1.3.0 && \ +RUN PIPX_HOME="" PIPX_BIN_DIR="/python_bin" pipx install -v ros-license-toolkit==1.2.2 && \ go install github.com/google/addlicense@v1.1.1 # install pybullet dependencies diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index 3da2ed30..a1b9d76e 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -65,19 +65,10 @@ jobs: name: License check runs-on: ubuntu-latest container: - image: ros:jazzy-ros-base + image: ghcr.io/cps-test-lab/scenario-execution steps: - name: Checkout code uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1 - - name: Prepare System - shell: bash - run: | - apt update - apt install -y pipx - pipx install ros-license-toolkit==1.3.0 - apt install -y golang-go - go version - go install github.com/google/addlicense@v1.1.1 - name: Check for license tags shell: bash run: | @@ -94,6 +85,6 @@ jobs: continue fi echo "Processing package at $pkg_dir" - ros_license_toolkit "$pkg_dir" + /python_bin/ros_license_toolkit "$pkg_dir" done From 09f7a9e3ca0531ae80dc2ea9bb019e11a17c882e Mon Sep 17 00:00:00 2001 From: Frederik Pasch Date: Thu, 2 Jan 2025 12:48:00 +0100 Subject: [PATCH 10/22] use pipx --- .github/workflows/scan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index a1b9d76e..f957cb83 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -65,7 +65,7 @@ jobs: name: License check runs-on: ubuntu-latest container: - image: ghcr.io/cps-test-lab/scenario-execution + image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }} steps: - name: Checkout code uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1 From d6c00fbaebc13f6fd204588bd651704dae45ada6 Mon Sep 17 00:00:00 2001 From: Frederik Pasch Date: Thu, 2 Jan 2025 12:54:52 +0100 Subject: [PATCH 11/22] use pipx --- .github/workflows/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Dockerfile b/.github/workflows/Dockerfile index 6fcd38fd..aa85359c 100644 --- a/.github/workflows/Dockerfile +++ b/.github/workflows/Dockerfile @@ -21,7 +21,7 @@ RUN --mount=type=bind,source=.,target=/scenario_execution \ # install dependencies for license check RUN PIPX_HOME="" PIPX_BIN_DIR="/python_bin" pipx install -v ros-license-toolkit==1.2.2 && \ - go install github.com/google/addlicense@v1.1.1 + GOPATH=/go go install github.com/google/addlicense@v1.1.1 # install pybullet dependencies RUN --mount=type=bind,source=.,target=/scenario_execution \ From 8deb039ca25dc57ead402e7076d3242f3b971ebf Mon Sep 17 00:00:00 2001 From: Frederik Pasch Date: Thu, 2 Jan 2025 13:11:25 +0100 Subject: [PATCH 12/22] update go --- .github/workflows/scan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index f957cb83..b1e0430b 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -72,7 +72,7 @@ jobs: - name: Check for license tags shell: bash run: | - find . -type f \( -name "*.py" -o -name "*.cpp" -o -name "*.h" \) -exec "$HOME"/go/bin/addlicense -check {} + + find . -type f \( -name "*.py" -o -name "*.cpp" -o -name "*.h" \) -exec /go/bin/addlicense -check {} + - name: Run ros_license_toolkit for each Package shell: bash run: | From 0cce5473949e8c655c8f7da6d656fcaf565f29e3 Mon Sep 17 00:00:00 2001 From: Frederik Pasch Date: Thu, 2 Jan 2025 13:23:27 +0100 Subject: [PATCH 13/22] update go --- .github/workflows/scan.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index b1e0430b..df421dc3 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -69,6 +69,8 @@ jobs: steps: - name: Checkout code uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1 + with: + set-safe-directory: /__w/scenario-execution/scenario-execution - name: Check for license tags shell: bash run: | @@ -76,7 +78,6 @@ jobs: - name: Run ros_license_toolkit for each Package shell: bash run: | - git config --global --add safe.directory /__w/scenario_execution/scenario_execution find . -name "package.xml" | while IFS= read -r pkg_file; do pkg_dir=$(dirname "$pkg_file") pkg_name=$(basename "$pkg_dir") From 0adb0a683f411d3b344ca407f036fff3d905ee40 Mon Sep 17 00:00:00 2001 From: Frederik Pasch Date: Thu, 2 Jan 2025 13:26:31 +0100 Subject: [PATCH 14/22] update go --- .github/workflows/scan.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index df421dc3..91730344 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -69,8 +69,6 @@ jobs: steps: - name: Checkout code uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1 - with: - set-safe-directory: /__w/scenario-execution/scenario-execution - name: Check for license tags shell: bash run: | From 9d6b64cb5a9bc4879aa7d16e8df688df7e713b0e Mon Sep 17 00:00:00 2001 From: Frederik Pasch Date: Thu, 2 Jan 2025 16:53:20 +0100 Subject: [PATCH 15/22] set dir --- .github/workflows/scan.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index 91730344..f357b313 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -69,6 +69,8 @@ jobs: steps: - name: Checkout code uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1 + with: + set-safe-directory: /venvs/ros-license-toolkit - name: Check for license tags shell: bash run: | From 4923bfd6eb1e58df5d735787d05e213033691527 Mon Sep 17 00:00:00 2001 From: Frederik Pasch Date: Thu, 2 Jan 2025 16:56:36 +0100 Subject: [PATCH 16/22] set dir --- .github/workflows/scan.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index f357b313..1217dd28 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -78,6 +78,7 @@ jobs: - name: Run ros_license_toolkit for each Package shell: bash run: | + git config --global --add safe.directory /__w/scenario-execution/scenario-execution find . -name "package.xml" | while IFS= read -r pkg_file; do pkg_dir=$(dirname "$pkg_file") pkg_name=$(basename "$pkg_dir") From 2636b016473344bf171403e9449df892a43599aa Mon Sep 17 00:00:00 2001 From: Frederik Pasch Date: Thu, 2 Jan 2025 17:14:23 +0100 Subject: [PATCH 17/22] set dir --- .github/workflows/scan.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index 1217dd28..3b25a29f 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -70,6 +70,7 @@ jobs: - name: Checkout code uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1 with: + clean: true set-safe-directory: /venvs/ros-license-toolkit - name: Check for license tags shell: bash From 10f4cc0cf027fba249de6fd12d7ff896ed17cdcc Mon Sep 17 00:00:00 2001 From: Frederik Pasch Date: Thu, 2 Jan 2025 17:18:50 +0100 Subject: [PATCH 18/22] set dir --- .github/workflows/scan.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index 3b25a29f..42a3b510 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -68,10 +68,10 @@ jobs: image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }} steps: - name: Checkout code - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1 - with: - clean: true - set-safe-directory: /venvs/ros-license-toolkit + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2 + # with: + # clean: true + # set-safe-directory: /venvs/ros-license-toolkit - name: Check for license tags shell: bash run: | @@ -79,7 +79,7 @@ jobs: - name: Run ros_license_toolkit for each Package shell: bash run: | - git config --global --add safe.directory /__w/scenario-execution/scenario-execution + # git config --global --add safe.directory /__w/scenario-execution/scenario-execution find . -name "package.xml" | while IFS= read -r pkg_file; do pkg_dir=$(dirname "$pkg_file") pkg_name=$(basename "$pkg_dir") From 877631272e15ae25158351558b066e89ed10e101 Mon Sep 17 00:00:00 2001 From: Frederik Pasch Date: Thu, 2 Jan 2025 17:30:33 +0100 Subject: [PATCH 19/22] set dir --- .github/workflows/scan.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index 42a3b510..33384884 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -69,9 +69,6 @@ jobs: steps: - name: Checkout code uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2 - # with: - # clean: true - # set-safe-directory: /venvs/ros-license-toolkit - name: Check for license tags shell: bash run: | @@ -79,7 +76,8 @@ jobs: - name: Run ros_license_toolkit for each Package shell: bash run: | - # git config --global --add safe.directory /__w/scenario-execution/scenario-execution + git config --global --add safe.directory /__w/scenario-execution/scenario-execution + git config --global --add safe.directory /venvs/ros-license-toolkit find . -name "package.xml" | while IFS= read -r pkg_file; do pkg_dir=$(dirname "$pkg_file") pkg_name=$(basename "$pkg_dir") From 92c3261af25c25aae32ad401c26b9803941e09fd Mon Sep 17 00:00:00 2001 From: Frederik Pasch Date: Thu, 2 Jan 2025 17:42:01 +0100 Subject: [PATCH 20/22] set dir --- .github/workflows/scan.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index 33384884..adb13111 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -65,19 +65,26 @@ jobs: name: License check runs-on: ubuntu-latest container: - image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }} + image: ros:jazzy-ros-base steps: - name: Checkout code uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2 + - name: Prepare System + shell: bash + run: | + apt update + apt install -y python3-pip golang-go + pipx install ros-license-toolkit==1.2.2 + go install github.com/google/addlicense@v1.1.1 - name: Check for license tags shell: bash run: | - find . -type f \( -name "*.py" -o -name "*.cpp" -o -name "*.h" \) -exec /go/bin/addlicense -check {} + + find . -type f \( -name "*.py" -o -name "*.cpp" -o -name "*.h" \) -exec addlicense -check {} + - name: Run ros_license_toolkit for each Package shell: bash run: | git config --global --add safe.directory /__w/scenario-execution/scenario-execution - git config --global --add safe.directory /venvs/ros-license-toolkit + git config --global --add safe.directory $HOME/.local/bin/ find . -name "package.xml" | while IFS= read -r pkg_file; do pkg_dir=$(dirname "$pkg_file") pkg_name=$(basename "$pkg_dir") @@ -86,6 +93,6 @@ jobs: continue fi echo "Processing package at $pkg_dir" - /python_bin/ros_license_toolkit "$pkg_dir" + $HOME/.local/bin/ros-license-toolkit "$pkg_dir" done From decd9aa357dceb10d45b085699148dfe5b52a1d6 Mon Sep 17 00:00:00 2001 From: Frederik Pasch Date: Thu, 2 Jan 2025 17:43:08 +0100 Subject: [PATCH 21/22] set dir --- .github/workflows/scan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index adb13111..7a80d7a3 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -73,7 +73,7 @@ jobs: shell: bash run: | apt update - apt install -y python3-pip golang-go + apt install -y pipx golang-go pipx install ros-license-toolkit==1.2.2 go install github.com/google/addlicense@v1.1.1 - name: Check for license tags From ae1896ea58b1e780c8caab175c0b3673f8dbfc47 Mon Sep 17 00:00:00 2001 From: Frederik Pasch Date: Thu, 2 Jan 2025 17:46:45 +0100 Subject: [PATCH 22/22] set dir --- .github/workflows/scan.yml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index 7a80d7a3..33384884 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -65,26 +65,19 @@ jobs: name: License check runs-on: ubuntu-latest container: - image: ros:jazzy-ros-base + image: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref }} steps: - name: Checkout code uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2 - - name: Prepare System - shell: bash - run: | - apt update - apt install -y pipx golang-go - pipx install ros-license-toolkit==1.2.2 - go install github.com/google/addlicense@v1.1.1 - name: Check for license tags shell: bash run: | - find . -type f \( -name "*.py" -o -name "*.cpp" -o -name "*.h" \) -exec addlicense -check {} + + find . -type f \( -name "*.py" -o -name "*.cpp" -o -name "*.h" \) -exec /go/bin/addlicense -check {} + - name: Run ros_license_toolkit for each Package shell: bash run: | git config --global --add safe.directory /__w/scenario-execution/scenario-execution - git config --global --add safe.directory $HOME/.local/bin/ + git config --global --add safe.directory /venvs/ros-license-toolkit find . -name "package.xml" | while IFS= read -r pkg_file; do pkg_dir=$(dirname "$pkg_file") pkg_name=$(basename "$pkg_dir") @@ -93,6 +86,6 @@ jobs: continue fi echo "Processing package at $pkg_dir" - $HOME/.local/bin/ros-license-toolkit "$pkg_dir" + /python_bin/ros_license_toolkit "$pkg_dir" done