Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove use of Industrial CI #359

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 14 additions & 40 deletions .github/workflows/clang_format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,50 +3,24 @@ name: Clang-Format
on:
push:
branches:
- master
- main
pull_request:
schedule:
- cron: '0 5 * * *'

# allow manually starting this workflow
workflow_dispatch:

jobs:
industrial_ci:
name: Format
runs-on: ubuntu-latest
env:
CI_NAME: Clang-Format
OS_NAME: ubuntu
OS_CODE_NAME: bionic
ROS_DISTRO: melodic
ROS_REPO: main
ROSDEP_SKIP_KEYS: "bullet bullet-extras opw_kinematics ros_industrial_cmake_boilerplate fcl ifopt benchmark"
CLANG_FORMAT_CHECK: file
CLANG_FORMAT_VERSION: 8
DOCKER_IMAGE: "rosindustrial/tesseract:melodic"
clang_format:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v1

- name: Free Disk Space
run: |
sudo swapoff -a
sudo rm -f /swapfile
sudo apt clean
docker rmi $(docker image ls -aq)
df -h

- name: Prepare ccache timestamp
id: ccache_cache_timestamp
shell: cmake -P {0}
- name: Run clang format
run: |
string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
message("::set-output name=timestamp::${current_date}")

- name: ccache cache files
uses: actions/[email protected]
with:
path: ${{ env.CI_NAME }}/.ccache
key: ${{ env.CI_NAME }}-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }}
restore-keys: |
${{ env.CI_NAME }}-ccache-

- uses: 'ros-industrial/industrial_ci@master'
env: ${{env}}
sudo apt update
sudo apt install -y git clang-format-8
if [ $? -ge 1 ]; then return 1; fi
./.run-clang-format
if [ $? -ge 1 ]; then return 1; fi
output=$(git diff)
if [ -n "$output" ]; then exit 1; else exit 0; fi
13 changes: 9 additions & 4 deletions .github/workflows/cmake_format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,26 @@ name: CMake-Format
on:
push:
branches:
- master
- main
pull_request:
schedule:
- cron: '0 5 * * *'

# allow manually starting this workflow
workflow_dispatch:

jobs:
cmake_lang:
name: Format
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2

- name: Run CMake Lang Format Check
run: |
sudo pip3 install cmakelang
RED='\033[0;31m'
NC='\033[0m' # No Color
./.run-cmake-format
output=$(git diff)
if [ -n "$output" ]; then printf "${RED}CMake format error: run script './.run-cmake-formate'${NC}\n"; fi
if [ -n "$output" ]; then printf "${RED}${output}${NC}\n"; fi
if [ -n "$output" ]; then exit 1; else exit 0; fi
57 changes: 0 additions & 57 deletions .github/workflows/focal_build.yml

This file was deleted.

39 changes: 39 additions & 0 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Ubuntu

on:
push:
branches:
- master
pull_request:
schedule:
- cron: '0 5 * * *'

jobs:
ci:
name: ${{ matrix.distro }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
distro: [focal, jammy]
container:
image: ghcr.io/tesseract-robotics/tesseract:${{ matrix.distro }}-0.21
env:
CCACHE_DIR: "$GITHUB_WORKSPACE/${{ matrix.distro }}/.ccache"
DEBIAN_FRONTEND: noninteractive
TZ: Etc/UTC
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
path: target_ws/src

- name: Build and Tests
uses: tesseract-robotics/colcon-action@v4
with:
before-script: source /opt/tesseract/install/setup.bash
ccache-prefix: ${{ matrix.distro }}
vcs-file: dependencies.repos
upstream-args: --cmake-args -DCMAKE_BUILD_TYPE=Release
target-path: target_ws/src
target-args: --cmake-args -DCMAKE_BUILD_TYPE=Debug -DTRAJOPT_ENABLE_TESTING=ON
46 changes: 46 additions & 0 deletions .github/workflows/unstable.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Unstable

on:
push:
branches:
- master
pull_request:
schedule:
- cron: '0 5 * * *'

jobs:
ci:
name: ${{ matrix.distro }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
distro: [focal, jammy]
container:
image: ghcr.io/tesseract-robotics/tesseract:${{ matrix.distro }}-master
env:
CCACHE_DIR: "$GITHUB_WORKSPACE/${{ matrix.distro }}/.ccache"
DEBIAN_FRONTEND: noninteractive
TZ: Etc/UTC
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
path: target_ws/src

- name: Install Depends
shell: bash
run: |
apt update
apt upgrade -y
apt install -y clang-tidy

- name: Build and Tests
uses: tesseract-robotics/colcon-action@v4
with:
before-script: source /opt/tesseract/install/setup.bash
ccache-prefix: ${{ matrix.distro }}
vcs-file: dependencies_unstable.repos
upstream-args: --cmake-args -DCMAKE_BUILD_TYPE=Release
target-path: target_ws/src
target-args: --cmake-args -DCMAKE_BUILD_TYPE=Debug -DTRAJOPT_ENABLE_TESTING=ON -DTRAJOPT_ENABLE_CLANG_TIDY=ON
57 changes: 0 additions & 57 deletions .github/workflows/unstable_build.yml

This file was deleted.

55 changes: 21 additions & 34 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
paths:
- 'trajopt**'
- '.github/workflows/windows.yml'
- '.github/workflows/dependencies.repos'
- '.github/workflows/windows_dependencies.repos'
schedule:
- cron: '0 5 * * *'

Expand All @@ -21,14 +21,9 @@ jobs:
matrix:
os: [windows-2019,windows-2022]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v2
with:
path: workspace/src/trajopt

- name: configure-msvc
uses: ilammy/msvc-dev-cmd@v1
with:
arch: x64
path: target_ws/src

- name: vcpkg build
uses: johnwason/vcpkg-action@v4
Expand All @@ -41,33 +36,25 @@ jobs:
extra-args: --clean-after-build
token: ${{ github.token }}
cache-key: ci-${{ matrix.os }}
revision: master
revision: 2023.08.09

- name: install-depends
shell: cmd
run: |
python -m pip install vcstool -q
python -m pip install colcon-common-extensions -q
python -m pip install ninja -q
- name: configure-msvc
uses: ilammy/msvc-dev-cmd@v1
with:
arch: x64

- name: build-workspace
working-directory: workspace
shell: cmd
- name: update environment
shell: bash
run: |
set PATH=%PATH%;%GITHUB_WORKSPACE%\vcpkg\installed\x64-windows-release\bin
set CMAKE_PREFIX_PATH=%GITHUB_WORKSPACE%\vcpkg\installed\x64-windows-release
vcs import --input "${{ github.workspace }}/workspace/src/trajopt/dependencies.repos" src/
if %ERRORLEVEL% GEQ 1 exit 1
colcon build --event-handlers console_direct+ --packages-ignore tesseract_examples trajopt_ifopt trajopt_sqp --cmake-args -G "Ninja" -DVCPKG_TARGET_TRIPLET=x64-windows-release -DCMAKE_BUILD_TYPE=Release -DTRAJOPT_ENABLE_TESTING=ON -DBUILD_IPOPT=OFF -DBUILD_SNOPT=OFF
if %ERRORLEVEL% GEQ 1 exit 1
echo "PATH=${{ env.PATH }};$GITHUB_WORKSPACE\vcpkg\installed\x64-windows-release\bin" >> "$GITHUB_ENV"
echo "CMAKE_PREFIX_PATH=$GITHUB_WORKSPACE\vcpkg\installed\x64-windows-release" >> "$GITHUB_ENV"

- name: run-test
working-directory: workspace
shell: cmd
run: |
call ./install/setup.bat
set PATH=%PATH%;%GITHUB_WORKSPACE%\vcpkg\installed\x64-windows-release\bin
colcon test --event-handlers console_direct+ --packages-ignore tesseract_examples trajopt_ifopt trajopt_sqp --return-code-on-test-failure
if %ERRORLEVEL% GEQ 1 exit 1
colcon test-result --verbose
if %ERRORLEVEL% GEQ 1 exit 1
- name: Build and Tests
uses: tesseract-robotics/colcon-action@v4
with:
ccache-prefix: ${{ matrix.distro }}
vcs-file: .github/workflows/windows_dependencies.repos
upstream-args: --cmake-args -G "Ninja" -DVCPKG_TARGET_TRIPLET=x64-windows-release -DCMAKE_BUILD_TYPE=Release -DBUILD_IPOPT=OFF -DBUILD_SNOPT=OFF
target-path: target_ws/src
target-args: --packages-ignore trajopt_ifopt trajopt_sqp --cmake-args -G "Ninja" -DVCPKG_TARGET_TRIPLET=x64-windows-release -DCMAKE_BUILD_TYPE=Release -DTRAJOPT_ENABLE_TESTING=ON
run-tests-args: --packages-ignore trajopt_ifopt trajopt_sqp
16 changes: 16 additions & 0 deletions .github/workflows/windows_dependencies.repos
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
- git:
local-name: ros_industrial_cmake_boilerplate
uri: https://github.com/ros-industrial/ros_industrial_cmake_boilerplate.git
version: master
- git:
local-name: tesseract
uri: https://github.com/ros-industrial-consortium/tesseract.git
version: master
- git:
local-name: opw_kinematics
uri: https://github.com/Jmeyer1292/opw_kinematics.git
version: master
- git:
local-name: ifopt
uri: https://github.com/ethz-adrl/ifopt.git
version: master
Loading
Loading