From 5ca0bb34eea6f6dca0c5fbe3235aed3e3dbbaf72 Mon Sep 17 00:00:00 2001 From: Levi Armstrong Date: Wed, 8 Nov 2023 20:33:23 -0600 Subject: [PATCH] Undo --- .github/workflows/api_docs.yml | 30 ----- .github/workflows/benchmarking.yml | 72 ------------ .github/workflows/clang_format.yml | 28 ----- .github/workflows/cmake_format.yml | 31 ----- .github/workflows/code_quality.yml | 74 ------------ .github/workflows/conda.yml | 83 -------------- .github/workflows/conda/recipe/activate.bat | 5 - .github/workflows/conda/recipe/activate.sh | 1 - .github/workflows/conda/recipe/bld.bat | 39 ------- .github/workflows/conda/recipe/build.sh | 29 ----- .github/workflows/conda/recipe/deactivate.bat | 0 .github/workflows/conda/recipe/deactivate.sh | 0 .github/workflows/conda/recipe/meta.yaml | 73 ------------ .github/workflows/nightly.yml | 67 ----------- .github/workflows/ubuntu.yml | 108 ------------------ .github/workflows/windows.yml | 71 ------------ .github/workflows/windows_dependencies.repos | 8 -- 17 files changed, 719 deletions(-) delete mode 100644 .github/workflows/api_docs.yml delete mode 100644 .github/workflows/benchmarking.yml delete mode 100644 .github/workflows/clang_format.yml delete mode 100644 .github/workflows/cmake_format.yml delete mode 100644 .github/workflows/code_quality.yml delete mode 100644 .github/workflows/conda.yml delete mode 100644 .github/workflows/conda/recipe/activate.bat delete mode 100755 .github/workflows/conda/recipe/activate.sh delete mode 100644 .github/workflows/conda/recipe/bld.bat delete mode 100755 .github/workflows/conda/recipe/build.sh delete mode 100644 .github/workflows/conda/recipe/deactivate.bat delete mode 100755 .github/workflows/conda/recipe/deactivate.sh delete mode 100644 .github/workflows/conda/recipe/meta.yaml delete mode 100644 .github/workflows/nightly.yml delete mode 100644 .github/workflows/ubuntu.yml delete mode 100644 .github/workflows/windows.yml delete mode 100644 .github/workflows/windows_dependencies.repos diff --git a/.github/workflows/api_docs.yml b/.github/workflows/api_docs.yml deleted file mode 100644 index 4832307e4d9..00000000000 --- a/.github/workflows/api_docs.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: Deploy Documentation - -on: - push: - branches: - - master - - # allow manually starting this workflow - workflow_dispatch: - -jobs: - deploy_documentation: - runs-on: ubuntu-latest - image: ubuntu:18.04 - steps: - - uses: actions/checkout@v2 - - - name: Build Doxygen Documentation - uses: mattnotmitt/doxygen-action@v1 - with: - doxyfile-path: 'docs/doxygen.config' - - - name: Deploy Documentation - uses: peaceiris/actions-gh-pages@v3 - with: - deploy_key: ${{ secrets.DOCS_DEPLOY_KEY }} - publish_dir: ./docs - destination_dir: tesseract - keep_files: true - external_repository: tesseract-robotics/tesseract_docs diff --git a/.github/workflows/benchmarking.yml b/.github/workflows/benchmarking.yml deleted file mode 100644 index fe3efac10cd..00000000000 --- a/.github/workflows/benchmarking.yml +++ /dev/null @@ -1,72 +0,0 @@ -name: Benchmarking - -on: - push: - branches: - - master - - # allow manually starting this workflow - workflow_dispatch: - -jobs: - benchmark: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - - name: Prepare ccache timestamp - id: ccache_cache_timestamp - shell: cmake -P {0} - 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/cache@v1.1.0 - with: - path: benchmark/.ccache - key: benchmark-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }} - restore-keys: | - benchmark-ccache- - - - uses: 'tesseract-robotics/industrial_ci@0109bf3523050402490b56e19c9554e7d7c5379f' - env: - DOCKER_IMAGE: ubuntu:20.04 - ROS_DISTRO: false - ADDITIONAL_DEBS: 'curl lsb-release liboctomap-dev' - AFTER_INIT: './.github/workflows/add_ros_apt_sources.sh' - UPSTREAM_WORKSPACE: 'dependencies.repos' - ROSDEP_SKIP_KEYS: "fcl opw_kinematics ros_industrial_cmake_boilerplate iwyu octomap catkin" - CCACHE_DIR: "${{ github.workspace }}/benchmark/.ccache" - UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release" - TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release -DTESSERACT_ENABLE_TESTING=OFF -DTESSERACT_ENABLE_BENCHMARKING=ON -DTESSERACT_ENABLE_RUN_BENCHMARKING=ON -DBENCHMARK_ARGS=CI_ONLY" - DOCKER_RUN_OPTS: '-v ${{ github.workspace }}/benchmarks:/root/benchmarks' - AFTER_SCRIPT: '$target_ws/src/tesseract/.run_combine_benchmark_results' - - - name: Store Bullet Discrete, FCL Discrete and Environment benchmark result - uses: benchmark-action/github-action-benchmark@v1 - with: - name: C++ Benchmark - tool: 'googlecpp' - output-file-path: ${{ github.workspace }}/benchmarks/tesseract-benchmark_result.json - benchmark-data-dir-path: tesseract/dev/bench - gh-repository: github.com/tesseract-robotics/tesseract_docs - github-token: ${{ secrets.GITHUB_TOKEN }} - auto-push: false - # Show alert with commit comment on detecting possible performance regression - alert-threshold: '200%' - comment-on-alert: true - fail-on-alert: false - alert-comment-cc-users: '@Levi-Armstrong' - max-items-in-chart: 20 - - - name: Push benchmark result - uses: cpina/github-action-push-to-another-repository@v1.6 - env: - SSH_DEPLOY_KEY: ${{ secrets.DOCS_DEPLOY_KEY }} - with: - source-directory: benchmark-data-repository/tesseract/dev/bench - destination-github-username: tesseract-robotics - destination-repository-name: tesseract_docs - target-branch: gh-pages - target-directory: tesseract/dev/bench diff --git a/.github/workflows/clang_format.yml b/.github/workflows/clang_format.yml deleted file mode 100644 index 8a1a6adb715..00000000000 --- a/.github/workflows/clang_format.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Clang-Format - -on: - push: - branches: - - master - - 'dev**' - pull_request: - paths: - - 'tesseract**' - - '.github/workflows/clang_format.yml' - - '**clang-format' - schedule: - - cron: '0 5 * * *' - -jobs: - clang_format: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - - name: Run clang format - run: | - sudo apt update - sudo apt install -y git clang-format - ./.run-clang-format - output=$(git diff) - if [ -n "$output" ]; then exit 1; else exit 0; fi diff --git a/.github/workflows/cmake_format.yml b/.github/workflows/cmake_format.yml deleted file mode 100644 index 501fbcbdf12..00000000000 --- a/.github/workflows/cmake_format.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: CMake-Format - -on: - push: - branches: - - master - - 'dev**' - pull_request: - paths: - - 'tesseract**' - - '.github/workflows/clang_format.yml' - - '**clang-format' - schedule: - - cron: '0 5 * * *' - -jobs: - cmake_format: - runs-on: ubuntu-20.04 - steps: - - 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 diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml deleted file mode 100644 index 5e30675bf57..00000000000 --- a/.github/workflows/code_quality.yml +++ /dev/null @@ -1,74 +0,0 @@ -name: Code Quality - -on: - push: - branches: - - master - - 'dev**' - pull_request: - paths: - - 'tesseract**' - - '.github/workflows/code_quality.yml' - - '.clang-tidy' - schedule: - - cron: '0 5 * * *' - -jobs: - ci: - name: ${{ matrix.job_type }} - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - job_type: [clang-tidy, codecov] - include: - - job_type: clang-tidy - env: - TARGET_CMAKE_ARGS: "-DTESSERACT_ENABLE_CLANG_TIDY=ON -DTESSERACT_ENABLE_TESTING=ON" - NOT_TEST_BUILD: true - - job_type: codecov - env: - TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug -DTESSERACT_ENABLE_CODE_COVERAGE=ON -DTESSERACT_WARNINGS_AS_ERRORS=OFF" - AFTER_SCRIPT: 'ici_with_unset_variables source ${HOME}/${PREFIX}target_ws/install/setup.bash && cd ${HOME}/${PREFIX}target_ws && colcon build --cmake-target ccov-all --packages-select tesseract_collision tesseract_common tesseract_environment tesseract_geometry tesseract_kinematics tesseract_srdf tesseract_state_solver tesseract_scene_graph tesseract_urdf && cd src/tesseract && git config --global --add safe.directory ${HOME}/${PREFIX}target_ws/src/tesseract && bash <(curl -s https://codecov.io/bash) -t 758610a6-d851-4185-a01a-5b9465889b62 -s ${HOME}/${PREFIX}target_ws/build -f *all-merged.info' - env: - DOCKER_IMAGE: ubuntu:20.04 - ROS_DISTRO: false - PREFIX: ${{ github.repository }}_ - ADDITIONAL_DEBS: 'curl lsb-release liboctomap-dev clang-tidy' - AFTER_INIT: './.github/workflows/add_ros_apt_sources.sh' - UPSTREAM_WORKSPACE: 'dependencies.repos' - ROSDEP_SKIP_KEYS: "fcl opw_kinematics ros_industrial_cmake_boilerplate iwyu octomap catkin" - CCACHE_DIR: "${{ github.workspace }}/${{ matrix.job_type }}/.ccache" - UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release" - steps: - - uses: actions/checkout@v2 - - - name: Free Disk Space - continue-on-error: true - 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} - run: | - string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC) - message("::set-output name=timestamp::${current_date}") - - - name: ccache cache files - continue-on-error: true - uses: actions/cache@v1.1.0 - with: - path: ${{ matrix.job_type }}/.ccache - key: ${{ matrix.job_type }}-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }} - restore-keys: | - ${{ matrix.job_type }}-ccache- - - - name: Build repository - uses: 'tesseract-robotics/industrial_ci@0109bf3523050402490b56e19c9554e7d7c5379f' - env: ${{ matrix.env }} - diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml deleted file mode 100644 index 66ef867eed8..00000000000 --- a/.github/workflows/conda.yml +++ /dev/null @@ -1,83 +0,0 @@ -name: Conda - -on: - push: - branches: - - master - - 'dev**' - pull_request: - paths: - - 'tesseract**' - - '.github/workflows/conda.yml' - - '**.repos' - release: - types: - - released - -jobs: - conda-win: - runs-on: windows-2019 - steps: - - uses: actions/checkout@v3 - with: - path: workspace/src/tesseract - - name: install-depends - shell: cmd - run: | - python -m pip install vcstool -q - - name: vcs import - run: > - vcs import --input "${{ github.workspace }}/workspace/src/tesseract/.github/workflows/windows_dependencies.repos" workspace/src/ - - uses: conda-incubator/setup-miniconda@v2 - with: - miniforge-variant: Mambaforge - channel-priority: true - channels: conda-forge - use-mamba: true - - name: conda install - run: | - mamba activate test - mamba update --all -y - mamba install boa conda-smithy -y - - name: build and test - run: | - mamba activate test - mkdir conda - xcopy /E workspace\src\tesseract\.github\workflows\conda conda - cd conda - New-Item -Name conda-forge.yml -ItemType File - conda smithy regenerate - - mamba mambabuild -m .ci_support/win_64_.yaml . - - conda-linux: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - path: workspace/src/tesseract - - name: install-depends - run: | - python -m pip install vcstool -q - - name: vcs import - run: > - vcs import --input "${{ github.workspace }}/workspace/src/tesseract/.github/workflows/windows_dependencies.repos" workspace/src/ - - uses: conda-incubator/setup-miniconda@v2 - with: - miniforge-variant: Mambaforge - channel-priority: true - channels: conda-forge - python-version: "3.10" - use-mamba: true - - name: conda install - run: | - mamba update --all -y - mamba install boa conda-smithy -y - - name: build and test - run: | - cp -r workspace/src/tesseract/.github/workflows/conda ./conda - cd conda - touch conda-forge.yml - conda smithy regenerate - - mamba mambabuild -m .ci_support/linux_64_.yaml . diff --git a/.github/workflows/conda/recipe/activate.bat b/.github/workflows/conda/recipe/activate.bat deleted file mode 100644 index 0e01a3a5695..00000000000 --- a/.github/workflows/conda/recipe/activate.bat +++ /dev/null @@ -1,5 +0,0 @@ -@if not defined CONDA_PREFIX goto:eof - -@call "%CONDA_PREFIX%\opt\tesseract_robotics\setup.bat" - -@set TESSERACT_PYTHON_DLL_PATH=%CONDA_PREFIX%\opt\tesseract_robotics\bin \ No newline at end of file diff --git a/.github/workflows/conda/recipe/activate.sh b/.github/workflows/conda/recipe/activate.sh deleted file mode 100755 index b4f02422945..00000000000 --- a/.github/workflows/conda/recipe/activate.sh +++ /dev/null @@ -1 +0,0 @@ -source "${CONDA_PREFIX}/opt/tesseract_robotics/setup.sh" \ No newline at end of file diff --git a/.github/workflows/conda/recipe/bld.bat b/.github/workflows/conda/recipe/bld.bat deleted file mode 100644 index 8802c8efadd..00000000000 --- a/.github/workflows/conda/recipe/bld.bat +++ /dev/null @@ -1,39 +0,0 @@ -set CXXFLAGS=%CXXFLAGS% -DEIGEN_DONT_ALIGN=1 -DEIGEN_DONT_VECTORIZE=1 -set CXXFLAGS=%CXXFLAGS% /std:c++17 - -colcon build --merge-install --install-base="%PREFIX%\opt\tesseract_robotics" ^ - --event-handlers console_cohesion+ ^ - --packages-ignore gtest osqp osqp_eigen tesseract_examples trajopt_ifopt trajopt_sqp ^ - --cmake-args -GNinja -DCMAKE_BUILD_TYPE=Release ^ - -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="/MD /O2 /Ob0 /Zi /DNDEBUG" ^ - -DCMAKE_RELWITHDEBINFO_POSTFIX="" ^ - -DBUILD_SHARED_LIBS=ON ^ - -DUSE_MSVC_RUNTIME_LIBRARY_DLL=ON ^ - -DBUILD_IPOPT=OFF ^ - -DBUILD_SNOPT=OFF ^ - -DCMAKE_PREFIX_PATH:PATH="%LIBRARY_PREFIX%" ^ - -DTESSERACT_ENABLE_CLANG_TIDY=OFF ^ - -DTESSERACT_ENABLE_CODE_COVERAGE=OFF ^ - -DPYTHON_EXECUTABLE="%PREFIX%\python.exe" ^ - -DTESSERACT_ENABLE_EXAMPLES=OFF ^ - -DTESSERACT_BUILD_TRAJOPT_IFOPT=OFF ^ - -DTESSERACT_ENABLE_TESTING=ON - -if %errorlevel% neq 0 exit /b %errorlevel% - -colcon test --event-handlers console_direct+ --return-code-on-test-failure ^ - --packages-ignore gtest osqp osqp_eigen tesseract_examples trajopt_ifopt trajopt_sqp tesseract_common ^ - --merge-install --install-base="%PREFIX%\opt\tesseract_robotics" - -if %errorlevel% neq 0 exit /b %errorlevel% - -setlocal EnableDelayedExpansion - -:: Copy the [de]activate scripts to %PREFIX%\etc\conda\[de]activate.d. -:: This will allow them to be run on environment activation. -for %%F in (activate deactivate) DO ( - if not exist %PREFIX%\etc\conda\%%F.d mkdir %PREFIX%\etc\conda\%%F.d - copy %RECIPE_DIR%\%%F.bat %PREFIX%\etc\conda\%%F.d\%PKG_NAME%_%%F.bat -) - -if %errorlevel% neq 0 exit /b %errorlevel% \ No newline at end of file diff --git a/.github/workflows/conda/recipe/build.sh b/.github/workflows/conda/recipe/build.sh deleted file mode 100755 index afd9e601686..00000000000 --- a/.github/workflows/conda/recipe/build.sh +++ /dev/null @@ -1,29 +0,0 @@ -set -e - -ln -s $BUILD_PREFIX/bin/x86_64-conda-linux-gnu-gcc $BUILD_PREFIX/bin/gcc - -colcon build --merge-install --install-base="$PREFIX/opt/tesseract_robotics" \ - --event-handlers console_cohesion+ \ - --packages-ignore gtest osqp osqp_eigen tesseract_examples trajopt_ifopt trajopt_sqp \ - --cmake-args -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=ON \ - -DBUILD_IPOPT=OFF \ - -DBUILD_SNOPT=OFF \ - -DCMAKE_PREFIX_PATH:PATH="$PREFIX" \ - -DTESSERACT_ENABLE_CLANG_TIDY=OFF \ - -DTESSERACT_ENABLE_CODE_COVERAGE=OFF \ - -DTESSERACT_ENABLE_EXAMPLES=OFF \ - -DTESSERACT_BUILD_TRAJOPT_IFOPT=OFF \ - -DSETUPTOOLS_DEB_LAYOUT=OFF \ - -DTESSERACT_ENABLE_TESTING=ON - -colcon test --event-handlers console_direct+ --return-code-on-test-failure \ - --packages-ignore gtest osqp osqp_eigen tesseract_examples trajopt_ifopt trajopt_sqp tesseract_common \ - --merge-install --install-base="$PREFIX/opt/tesseract_robotics" - - -for CHANGE in "activate" "deactivate" -do - mkdir -p "${PREFIX}/etc/conda/${CHANGE}.d" - cp "${RECIPE_DIR}/${CHANGE}.sh" "${PREFIX}/etc/conda/${CHANGE}.d/${PKG_NAME}_${CHANGE}.sh" -done \ No newline at end of file diff --git a/.github/workflows/conda/recipe/deactivate.bat b/.github/workflows/conda/recipe/deactivate.bat deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/.github/workflows/conda/recipe/deactivate.sh b/.github/workflows/conda/recipe/deactivate.sh deleted file mode 100755 index e69de29bb2d..00000000000 diff --git a/.github/workflows/conda/recipe/meta.yaml b/.github/workflows/conda/recipe/meta.yaml deleted file mode 100644 index 0ee5daa35f6..00000000000 --- a/.github/workflows/conda/recipe/meta.yaml +++ /dev/null @@ -1,73 +0,0 @@ -package: - name: tesseract - version: "0.1.0" - -source: - path: ../../workspace - -requirements: - build: - - {{ compiler('c') }} - - {{ compiler('cxx') }} - - gtest - - gmock - - cmake - - ninja # [win] - - make # [linux] - - pkg-config - - swig - - colcon-common-extensions - - lcov - - {{ cdt('mesa-libgl-devel') }} # [linux] - - {{ cdt('mesa-dri-drivers') }} # [linux] - host: - - boost-cpp - - eigen - - tinyxml2 - - console_bridge - - assimp - - urdfdom - - fcl - - octomap - - orocos-kdl - - pcl - - gtest - - gmock - - pkg-config - - xz - - flann - - jsoncpp - - yaml-cpp - - bullet-cpp - - blas - - xorg-libx11 # [unix] - - xorg-libxext # [unix] - run: - - boost-cpp - - eigen - - tinyxml2 - - console_bridge - - assimp - - urdfdom - - fcl - - octomap - - orocos-kdl - - pcl - - gtest - - gmock - - xz - - jsoncpp - - taskflow - - yaml-cpp - - bullet-cpp - - blas - - xorg-libx11 # [unix] - - xorg-libxext # [unix] - -build: - skip: true # [py<37] - number: 0 - -about: - home: https://github.com/ros-industrial-consortium/tesseract - summary: Tesseract robotics motion planning framework \ No newline at end of file diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml deleted file mode 100644 index fe262e12dae..00000000000 --- a/.github/workflows/nightly.yml +++ /dev/null @@ -1,67 +0,0 @@ -name: Nightly - -on: - pull_request: - types: [labeled] - schedule: - - cron: '0 5 * * *' - - # allow manually starting this workflow - workflow_dispatch: - -jobs: - industrial_ci: - if: contains(github.event.pull_request.labels.*.name, 'check-tesseract-ros') || github.event.schedule == true - name: ${{ matrix.distro }} - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - distro: [bionic, focal] - include: - - distro: bionic - image: ubuntu:18.04 - - distro: focal - image: ubuntu:20.04 - - steps: - - uses: actions/checkout@v2 - - - name: Free Disk Space - continue-on-error: true - 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} - run: | - string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC) - message("::set-output name=timestamp::${current_date}") - - - name: ccache cache files - continue-on-error: true - uses: actions/cache@v1.1.0 - with: - path: ${{ matrix.distro }}/.ccache - key: ${{ matrix.distro }}-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }} - restore-keys: | - ${{ matrix.distro }}-ccache- - - - uses: 'tesseract-robotics/industrial_ci@0109bf3523050402490b56e19c9554e7d7c5379f' - env: - DOCKER_IMAGE: ${{ matrix.image }} - ROS_DISTRO: false - ADDITIONAL_DEBS: 'curl lsb-release liboctomap-dev' - AFTER_INIT: './.github/workflows/add_ros_apt_sources.sh' - UPSTREAM_WORKSPACE: 'dependencies.repos' - DOWNSTREAM_WORKSPACE: 'github:ros-industrial-consortium/tesseract_planning#master github:ros-industrial-consortium/trajopt_ros#master github:ros-industrial-consortium/tesseract_ros#master' - ROSDEP_SKIP_KEYS: "fcl opw_kinematics ros_industrial_cmake_boilerplate iwyu octomap catkin" - CCACHE_DIR: "${{ github.workspace }}/${{ matrix.distro}}/.ccache" - UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release" - TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release" - DOWNSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release" diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml deleted file mode 100644 index 0b765c370ac..00000000000 --- a/.github/workflows/ubuntu.yml +++ /dev/null @@ -1,108 +0,0 @@ -name: Ubuntu - -on: - push: - branches: - - master - - 'dev**' - pull_request: - paths: - - 'tesseract**' - - '.github/workflows/ubuntu.yml' - - '**.repos' - schedule: - - cron: '0 5 * * *' - release: - types: - - released - -jobs: - ci: - name: ${{ matrix.distro }} - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - distro: [focal, jammy] - env: - CCACHE_DIR: "${{ github.workspace }}/${{ matrix.distro }}/.ccache" - REGISTRY: ghcr.io - IMAGE_NAME: ${{ github.repository }} - PUSH_DOCKER_IMAGE: ${{ github.ref == 'refs/heads/master' || github.event_name == 'release' }} - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - - name: Free disk space - continue-on-error: true - 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} - run: | - string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC) - message("::set-output name=timestamp::${current_date}") - - - name: ccache cache files - continue-on-error: true - uses: actions/cache@v1.1.0 - with: - path: ${{ matrix.distro }}/.ccache - key: ${{ matrix.distro }}-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }} - restore-keys: | - ${{ matrix.distro }}-ccache- - - - name: Login to Github container registry - uses: docker/login-action@v1 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Extract Docker meta-information - id: meta - uses: docker/metadata-action@v3 - with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - flavor: | - latest=false - prefix= - suffix= - tags: | - type=ref,event=branch,prefix=${{ matrix.distro }}- - type=semver,pattern={{major}}.{{minor}},prefix=${{ matrix.distro }}- - - - name: Set build type - run: | - if [[ "${{ env.PUSH_DOCKER_IMAGE }}" = true ]] - then - echo "BUILD_TYPE=Release" >> $GITHUB_ENV - else - echo "BUILD_TYPE=Debug" >> $GITHUB_ENV - fi - - - name: Build repository - uses: 'tesseract-robotics/industrial_ci@0109bf3523050402490b56e19c9554e7d7c5379f' - env: - DOCKER_IMAGE: ubuntu:${{ matrix.distro }} - ROS_DISTRO: false - ADDITIONAL_DEBS: 'curl lsb-release liboctomap-dev' - AFTER_INIT: './.github/workflows/add_ros_apt_sources.sh' - UPSTREAM_WORKSPACE: 'dependencies.repos' - ROSDEP_SKIP_KEYS: "fcl opw_kinematics ros_industrial_cmake_boilerplate iwyu octomap catkin" - PREFIX: ${{ github.repository }}_ - UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release" - TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DTESSERACT_ENABLE_TESTING=ON" - BEFORE_RUN_TARGET_TEST_EMBED: "ici_with_unset_variables source $BASEDIR/${PREFIX}target_ws/install/setup.bash" - AFTER_SCRIPT: 'rm -r $BASEDIR/${PREFIX}upstream_ws/build $BASEDIR/${PREFIX}target_ws/build' - DOCKER_COMMIT: ${{ steps.meta.outputs.tags }} - - - name: Push post-build Docker - if: ${{ env.PUSH_DOCKER_IMAGE == 'true' }} - run: docker push ${{ steps.meta.outputs.tags }} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml deleted file mode 100644 index e57f54b50c0..00000000000 --- a/.github/workflows/windows.yml +++ /dev/null @@ -1,71 +0,0 @@ -name: Windows - -on: - push: - branches: - - master - - 'dev**' - pull_request: - paths: - - 'tesseract**' - - '.github/workflows/windows.yml' - - '.github/workflows/windows_dependencies.repos' - schedule: - - cron: '0 5 * * *' - -jobs: - ci: - name: ${{ matrix.os }} - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: [windows-2019, windows-2022] - steps: - - uses: actions/checkout@v3 - with: - path: workspace/src/tesseract - - - name: vcpkg build - uses: johnwason/vcpkg-action@v5 - with: - pkgs: fcl bullet3[multithreading,double-precision,rtti] octomap console-bridge eigen3 yaml-cpp benchmark tinyxml2 assimp orocos-kdl pcl lapack-reference boost-dll boost-filesystem boost-filesystem boost-serialization boost-program-options boost-graph urdfdom ccd[double-precision] gtest - triplet: x64-windows-release - extra-args: --clean-after-build - token: ${{ github.token }} - cache-key: ci-${{ matrix.os }} - 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 - 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/tesseract/.github/workflows/windows_dependencies.repos" src/ - if %ERRORLEVEL% GEQ 1 exit 1 - colcon build --event-handlers console_direct+ --cmake-args -G "Ninja" -DVCPKG_TARGET_TRIPLET=x64-windows-release -DCMAKE_BUILD_TYPE=Release -DTESSERACT_ENABLE_TESTING=ON - if %ERRORLEVEL% GEQ 1 exit 1 - - - 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+ --return-code-on-test-failure - if %ERRORLEVEL% GEQ 1 exit 1 - colcon test-result --verbose - if %ERRORLEVEL% GEQ 1 exit 1 diff --git a/.github/workflows/windows_dependencies.repos b/.github/workflows/windows_dependencies.repos deleted file mode 100644 index fb33f93375e..00000000000 --- a/.github/workflows/windows_dependencies.repos +++ /dev/null @@ -1,8 +0,0 @@ -- git: - local-name: ros_industrial_cmake_boilerplate - uri: https://github.com/ros-industrial/ros_industrial_cmake_boilerplate.git - version: 0.5.3 -- git: - local-name: opw_kinematics - uri: https://github.com/Jmeyer1292/opw_kinematics.git - version: 0.5.0