Skip to content

Commit

Permalink
Merge pull request #2495 from stack-of-tasks/topic/update-pixi
Browse files Browse the repository at this point in the history
Update pixi lockfile
  • Loading branch information
jorisv authored Dec 3, 2024
2 parents 760851f + e0f0f23 commit c0d4225
Show file tree
Hide file tree
Showing 4 changed files with 6,772 additions and 11,455 deletions.
16 changes: 10 additions & 6 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ jobs:
steps:
- name: Setup Container
run: |
apt update && DEBIAN_FRONTEND="noninteractive" apt install -y sudo lsb-release gnupg2 cmake git python3
apt-get -qq update
DEBIAN_FRONTEND="noninteractive" apt-get -qq install -y lsb-release gnupg2 cmake git python3
- uses: actions/checkout@v4
with:
fetch-depth: 0
Expand Down Expand Up @@ -81,10 +83,11 @@ jobs:
run: |
sh -c "echo \"deb [arch=amd64] http://robotpkg.openrobots.org/packages/debian/pub $(lsb_release -cs) robotpkg\" >> /etc/apt/sources.list "
apt-key adv --fetch-keys http://robotpkg.openrobots.org/packages/debian/robotpkg.key
- name: Set and install dependencies
run: |
rm -rf /usr/local/share/boost/1.69.0
export PYTHON3_VERSION=$(python3 -c "import sys; print(str(sys.version_info.major)+str(sys.version_info.minor))")
# Force eigenpy 3.10.0 to be compatible with hpp-fcl
export APT_DEPENDENCIES="doxygen \
ccache \
curl \
Expand All @@ -101,17 +104,19 @@ jobs:
libboost-python-dev \
python3-numpy \
python3-matplotlib \
robotpkg-py${PYTHON3_VERSION}-eigenpy \
robotpkg-py${PYTHON3_VERSION}-eigenpy=3.10.0 \
robotpkg-py${PYTHON3_VERSION}-hpp-fcl \
robotpkg-py${PYTHON3_VERSION}-casadi"
echo $APT_DEPENDENCIES
apt-get update -qq
DEBIAN_FRONTEND="noninteractive" apt-get install -qq ${APT_DEPENDENCIES}
- name: Free disk space
run: |
apt clean
df -h
- name: Run cmake
run: |
# Add cloned repo to safe.directory, since it was not cloned by the container
Expand All @@ -138,7 +143,7 @@ jobs:
make -j2 build_tests
export CTEST_OUTPUT_ON_FAILURE=1
make test
sudo make install
make install
- name: Test packaging
run: |
Expand Down Expand Up @@ -193,11 +198,10 @@ jobs:
make -j2
./run_fk
- name: Uninstall project
run: |
cd build
sudo make uninstall
make uninstall
check:
if: always()
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/macos-linux-windows-pixi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ jobs:

- uses: prefix-dev/[email protected]
with:
pixi-version: v0.33.0
cache: true
environments: ${{ matrix.environment }}

Expand Down
17 changes: 16 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,28 @@ endif()
set(DOXYGEN_USE_MATHJAX YES)
set(DOXYGEN_USE_TEMPLATE_CSS YES)

# ----------------------------------------------------
# --- Policy -----------------------------------------
# CMake Policy setup
# ----------------------------------------------------
# Policy can be removed when cmake_minimum_required is updated.

# We also set CMAKE_POLICY_DEFAULT_CMPXXXX because CMake modules can reset policy and redefine some
# macros like `find_dependency` that will not use our policy.

# Use BoostConfig module distributed by boost library instead of using FindBoost module distributed
# by CMake
# by CMake (to remove in 3.30). This policy is not working when using clang-cl.
if(NOT WIN32 OR NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
if(POLICY CMP0167)
cmake_policy(SET CMP0167 NEW)
set(CMAKE_POLICY_DEFAULT_CMP0167 NEW)
endif()
endif()
# install() DESTINATION paths are normalized (to remove in 3.31).
if(POLICY CMP0177)
cmake_policy(SET CMP0177 NEW)
set(CMAKE_POLICY_DEFAULT_CMP0177 NEW)
endif()
include("${JRL_CMAKE_MODULES}/base.cmake")

compute_project_args(PROJECT_ARGS LANGUAGES CXX)
Expand Down
Loading

0 comments on commit c0d4225

Please sign in to comment.