From 36158f7d4af64861a32607900f7302dfbd676a77 Mon Sep 17 00:00:00 2001 From: Tomas Baca Date: Wed, 26 Jul 2023 10:12:45 +0200 Subject: [PATCH] updated ci --- .github/workflows/noetic.yml | 47 ++++++++++++++++++------------------ CMakeLists.txt | 7 +----- package.xml | 2 +- 3 files changed, 26 insertions(+), 30 deletions(-) diff --git a/.github/workflows/noetic.yml b/.github/workflows/noetic.yml index de7a43e..e3318c1 100644 --- a/.github/workflows/noetic.yml +++ b/.github/workflows/noetic.yml @@ -2,43 +2,44 @@ name: Noetic on: push: - branches: [ master ] - paths-ignore: - - '**/README.md' - - '**.yaml' - - '**.launch' + + branches: [ hw_api ] + pull_request: - branches: [ master ] + branches: [ hw_api ] - schedule: - - cron: '0 0 * * *' # at the end of every day + # schedule: + # - cron: '0 0 * * *' # at the end of every day # Allows you to run this workflow manually from the Actions tab workflow_dispatch: jobs: - cancel: - - name: Cancel Previous Runs - runs-on: ubuntu-latest - steps: - - name: Cancel Previous Runs - uses: styfle/cancel-workflow-action@0.11.0 - with: - access_token: ${{ github.token }} - build: runs-on: ubuntu-20.04 + + env: + PUSH_TOKEN: ${{ secrets.PUSH_TOKEN }} + steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v3 with: - fetch-depth: 0 # fetch the whole history + fetch-depth: 0 - - name: Install - run: ./.ci/install.sh + - name: Checkout CI scripts + uses: actions/checkout@v3 + with: + repository: ctu-mrs/ci_scripts + path: .ci_scripts + token: ${{ secrets.PUSH_TOKEN }} + + - name: Install ROS + run: .ci_scripts/package_build/install_ros.sh - name: Build - run: ./.ci/build.sh + run: .ci_scripts/package_build/build_package.sh + + - name: Deploy + run: .ci_scripts/package_build/deploy_deb.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index 5dc485c..7056f0c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -231,7 +231,7 @@ target_link_libraries(MRSSafetyLedPlugin ## | Install | ## -------------------------------------------------------------- -install(TARGETS MRSGazeboGuiManager MRSGazeboRvizCameraSynchronizer MRSGazeboStaticTransformRepublisher MRSGazeboRangefinderPlugin MRSGazebo2DLidarPlugin MRSGazebo3DLidarPlugin MRSGazebo3DLidarGpuPlugin MRSGazeboCameraPlugin MRSGazeboRealsensePlugin MRSGazeboParachutePlugin MRSGazeboWaterGunPlugin MRSGazeboGPSPlugin MRSGazeboMagnetometerPlugin MRSGazeboLightPlugin MRSGazeboServoCameraPlugin MRSGazeboDynamicModelPlugin +install(TARGETS MRSGazeboGuiManager MRSGazeboRvizCameraSynchronizer MRSGazeboStaticTransformRepublisher MRSGazeboRangefinderPlugin MRSGazebo2DLidarPlugin MRSGazebo3DLidarPlugin MRSGazebo3DLidarGpuPlugin MRSGazeboCameraPlugin MRSGazeboRealsensePlugin MRSGazeboParachutePlugin MRSGazeboWaterGunPlugin MRSGazeboGPSPlugin MRSGazeboMagnetometerPlugin MRSGazeboLightPlugin MRSGazeboServoCameraPlugin MRSGazeboDynamicModelPlugin ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION} @@ -244,8 +244,3 @@ install(DIRECTORY models/ install(DIRECTORY worlds/ DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/worlds ) - -install(DIRECTORY ./ - DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} - FILES_MATCHING PATTERN "*.xml" - ) diff --git a/package.xml b/package.xml index da6fdcc..48e264e 100644 --- a/package.xml +++ b/package.xml @@ -17,7 +17,7 @@ tf2_ros tf2_msgs std_msgs - qt + libqt5-widgets gazebo gazebo_ros gazebo_plugins