Skip to content

Commit

Permalink
Merge pull request #1477 from robotology/traversaro-patch-3
Browse files Browse the repository at this point in the history
Remove workarounds for #1139
  • Loading branch information
traversaro authored Sep 12, 2023
2 parents 8f2e083 + 7ed57d2 commit a50aeb2
Showing 1 changed file with 0 additions and 22 deletions.
22 changes: 0 additions & 22 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,6 @@ jobs:
shell: bash -l {0}
run: cmake -S . -B build/ -DROBOTOLOGY_USES_IGNITION:BOOL=ON

# Workaround for https://github.com/robotology/robotology-superbuild/issues/1139
- name: Configure Unstable [Conda]
if: contains(matrix.project_tags, 'Unstable')
shell: bash -l {0}
run: cmake -S . -B build/ -DROBOTOLOGY_ENABLE_EVENT_DRIVEN:BOOL=OFF

# For some reason, the Strawberry perl's pkg-config is found
# instead of the conda's one, so let's delete the /c/Strawberry directory
- name: Debug pkg-config problem
Expand Down Expand Up @@ -265,13 +259,6 @@ jobs:
cd build
cmake -DROBOTOLOGY_USES_MUJOCO:BOOL=OFF .
# Workaround for https://github.com/robotology/robotology-superbuild/issues/1139
- name: Configure Unstable [Docker]
if: contains(matrix.project_tags, 'Unstable')
run: |
cd build
cmake -DROBOTOLOGY_ENABLE_EVENT_DRIVEN:BOOL=OFF .
- name: Build [Docker]
run: |
cd build
Expand Down Expand Up @@ -418,15 +405,6 @@ jobs:
cmake -C ${ROBOTOLOGY_SUPERBUILD_SOURCE_DIR}/.ci/initial-cache.gh.cmake -A x64 -DCMAKE_TOOLCHAIN_FILE=C:/robotology/vcpkg/scripts/buildsystems/vcpkg.cmake -DROBOTOLOGY_USES_MATLAB:BOOL=OFF -DYCM_BOOTSTRAP_VERBOSE=ON -DYCM_EP_INSTALL_DIR=C:/robotology/robotology -DNON_INTERACTIVE_BUILD:BOOL=TRUE -DCMAKE_BUILD_TYPE=Debug ${{ matrix.project_tags_cmake_options }} ..
cmake -DROBOTOLOGY_ENABLE_TELEOPERATION:BOOL=OFF .
# Workaround for https://github.com/robotology/robotology-superbuild/issues/1139
- name: Configure Unstable
if: contains(matrix.project_tags, 'Unstable')
shell: bash
run: |
cd ${ROBOTOLOGY_SUPERBUILD_SOURCE_DIR}
cd build
cmake -DROBOTOLOGY_ENABLE_EVENT_DRIVEN:BOOL=OFF .
- name: Disable options unsupported on Ubuntu 20.04 and vcpkg
if: contains(matrix.os, '20.04') || contains(matrix.os, 'windows')
shell: bash
Expand Down

0 comments on commit a50aeb2

Please sign in to comment.