From 05d54d10fd6985039b8e4fc03174d3cdde29cb18 Mon Sep 17 00:00:00 2001 From: Lou Amadio Date: Wed, 7 Oct 2020 14:10:16 -0700 Subject: [PATCH] Update CI --- .github/workflows/main.yml | 55 +++++++---------- ci/defaults.yaml | 13 ---- ci/deps.rosinstall | 120 ------------------------------------- ci/environment.yaml | 20 ------- ci/toolchain.cmake | 1 - 5 files changed, 22 insertions(+), 187 deletions(-) delete mode 100644 ci/defaults.yaml delete mode 100644 ci/deps.rosinstall delete mode 100644 ci/environment.yaml delete mode 100644 ci/toolchain.cmake diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a7d7477b..4fc89eb6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,54 +1,43 @@ -name: Azure_Kinect_ROS_Driver CI +name: CI on: pull_request: push: branches: - - master - melodic schedule: - - cron: '0 0 */3 * *' + # every Monday + - cron: '0 0 * * 1' jobs: - build_and_test: - runs-on: ${{ matrix.os }} + build: + runs-on: [windows-latest] strategy: fail-fast: false matrix: - os: [windows-latest] + ROSDISTRO: [melodic] steps: - uses: actions/checkout@v2 - - name: Cache Conda - id: conda-cache - uses: actions/cache@v1 with: - path: c:/miniconda/envs/myenv - key: ${{ runner.os }}-conda-${{ hashFiles('ci/environment.yaml') }} - restore-keys: | - ${{ runner.os }}-conda- - - uses: goanpeca/setup-miniconda@v1 - with: - activate-environment: myenv - environment-file: ci/environment.yaml - python-version: 3.7 - - name: Cleanup windows environment - shell: bash + submodules: recursive + path: src + - name: Install + shell: cmd run: | - rm -rf /c/hostedtoolcache/windows/Boost/1.72.0/lib/cmake/Boost-1.72.0 - mkdir -p /c/ci - cp $GITHUB_WORKSPACE/ci/toolchain.cmake /c/ci + choco sources add -n=roswin -s https://aka.ms/ros/public --priority 1 + choco install ros-%ROSDISTRO%-desktop_full -y --no-progress + env: + ROSDISTRO: ${{ matrix.ROSDISTRO }} - name: Install Azure Kinect Sensor SDK shell: powershell run: | wget https://download.microsoft.com/download/e/6/6/e66482b2-b6c1-4e34-bfee-95294163fc40/Azure%20Kinect%20SDK%201.3.0.exe -OutFile sdk.exe $p = Start-Process -PassThru -FilePath ".\sdk.exe" -Wait -NoNewWindow -ArgumentList "/passive" - $p.WaitForExit() - - uses: ros-tooling/action-ros-ci@0.0.17 - with: - package-name: azure_kinect_ros_driver - vcs-repo-file-url: ${{ github.workspace }}/ci/deps.rosinstall - extra-cmake-args: "-G Ninja -DCMAKE_TOOLCHAIN_FILE=c:/ci/toolchain.cmake -DCATKIN_SKIP_TESTING=ON -DCMAKE_BUILD_TYPE=Release" + $p.WaitForExit() + - name: Build + shell: cmd + run: | + call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=amd64 -host_arch=amd64 + call "C:\opt\ros\%ROSDISTRO%\x64\setup.bat" + catkin_make -DPYTHON_EXECUTABLE=C:\opt\ros\%ROSDISTRO%\x64\python.exe env: - COLCON_DEFAULTS_FILE: ${{ github.workspace }}/ci/defaults.yaml - ROS_PYTHON_VERSION: 3 - CC: cl.exe - CXX: cl.exe + ROSDISTRO: ${{ matrix.ROSDISTRO }} diff --git a/ci/defaults.yaml b/ci/defaults.yaml deleted file mode 100644 index b0f63a69..00000000 --- a/ci/defaults.yaml +++ /dev/null @@ -1,13 +0,0 @@ -{ - "build": { - "symlink-install": true, - "event-handlers": ["console_cohesion+"], - "install-base": "c:\\miniconda\\envs\\myenv\\library", - "parallel-workers" : 1, - "merge-install": true - }, - "test": { - "merge-install": true, - "install-base": "c:\\miniconda\\envs\\myenv\\library" - } -} diff --git a/ci/deps.rosinstall b/ci/deps.rosinstall deleted file mode 100644 index 63b25a61..00000000 --- a/ci/deps.rosinstall +++ /dev/null @@ -1,120 +0,0 @@ -- git: - local-name: actionlib - uri: https://github.com/ros/actionlib.git - version: melodic-devel -- git: - local-name: angles - uri: https://github.com/ros/angles.git - version: master -- git: - local-name: bond_core - uri: https://github.com/ros/bond_core.git - version: kinetic-devel -- git: - local-name: catkin - uri: https://github.com/ros/catkin.git - version: kinetic-devel -- git: - local-name: class_loader - uri: https://github.com/ros/class_loader.git - version: melodic-devel -- git: - local-name: cmake_modules - uri: https://github.com/ros/cmake_modules.git - version: 0.4-devel -- git: - local-name: common_msgs - uri: https://github.com/ros/common_msgs.git - version: jade-devel -- git: - local-name: gencpp - uri: https://github.com/ros/gencpp.git - version: kinetic-devel -- git: - local-name: geneus - uri: https://github.com/jsk-ros-pkg/geneus.git - version: master -- git: - local-name: genlisp - uri: https://github.com/ros/genlisp.git - version: kinetic-devel -- git: - local-name: genmsg - uri: https://github.com/ros/genmsg.git - version: kinetic-devel -- git: - local-name: gennodejs - uri: https://github.com/RethinkRobotics-opensource/gennodejs.git - version: kinetic-devel -- git: - local-name: genpy - uri: https://github.com/ros/genpy.git - version: kinetic-devel -- git: - local-name: geometry2 - uri: https://github.com/ros/geometry2.git - version: melodic-devel -- git: - local-name: image_common - uri: https://github.com/ros-perception/image_common.git - version: hydro-devel -- git: - local-name: message_generation - uri: https://github.com/ros/message_generation.git - version: kinetic-devel -- git: - local-name: message_runtime - uri: https://github.com/ros/message_runtime.git - version: kinetic-devel -- git: - local-name: nodelet_core - uri: https://github.com/ros/nodelet_core.git - version: indigo-devel -- git: - local-name: pluginlib - uri: https://github.com/ros/pluginlib.git - version: melodic-devel -- git: - local-name: ros - uri: https://github.com/ros/ros.git - version: kinetic-devel -- git: - local-name: ros_comm - uri: https://github.com/ros/ros_comm.git - version: melodic-devel -- git: - local-name: ros_comm_msgs - uri: https://github.com/ros/ros_comm_msgs.git - version: kinetic-devel -- git: - local-name: ros_environment - uri: https://github.com/ros/ros_environment.git - version: melodic -- git: - local-name: rosconsole - uri: https://github.com/ros/rosconsole.git - version: melodic-devel -- git: - local-name: roscpp_core - uri: https://github.com/ros/roscpp_core.git - version: kinetic-devel -- git: - local-name: roslint - uri: https://github.com/ros/roslint.git - version: master -- git: - local-name: rospack - uri: https://github.com/ros/rospack.git - version: melodic-devel -- git: - local-name: std_msgs - uri: https://github.com/ros/std_msgs.git - version: kinetic-devel -- git: - local-name: vision_opencv - uri: https://github.com/ms-iot/vision_opencv.git - version: windows_py3 -- git: - local-name: xacro - uri: https://github.com/ros/xacro.git - version: melodic-devel diff --git a/ci/environment.yaml b/ci/environment.yaml deleted file mode 100644 index 63b8bb87..00000000 --- a/ci/environment.yaml +++ /dev/null @@ -1,20 +0,0 @@ -name: myenv -channels: - - conda-forge - - defaults -dependencies: - - python=3.7 - - colcon-common-extensions - - colcon-ros=0.3.18 - - vcstool - - rosdep - - eigen=3 - - boost=1.69 - - opencv=3 - - tinyxml2 - - sip=4.19.20 - - qt - - poco - - console_bridge - - bzip2 - - python-orocos-kdl diff --git a/ci/toolchain.cmake b/ci/toolchain.cmake deleted file mode 100644 index dc55eb7d..00000000 --- a/ci/toolchain.cmake +++ /dev/null @@ -1 +0,0 @@ -ADD_DEFINITIONS(-DBOOST_ALL_DYN_LINK=1) \ No newline at end of file