Skip to content

Commit c0d4225

Browse files
authored
Merge pull request #2495 from stack-of-tasks/topic/update-pixi
Update pixi lockfile
2 parents 760851f + e0f0f23 commit c0d4225

File tree

4 files changed

+6772
-11455
lines changed

4 files changed

+6772
-11455
lines changed

.github/workflows/linux.yml

+10-6
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ jobs:
4747
steps:
4848
- name: Setup Container
4949
run: |
50-
apt update && DEBIAN_FRONTEND="noninteractive" apt install -y sudo lsb-release gnupg2 cmake git python3
50+
apt-get -qq update
51+
DEBIAN_FRONTEND="noninteractive" apt-get -qq install -y lsb-release gnupg2 cmake git python3
52+
5153
- uses: actions/checkout@v4
5254
with:
5355
fetch-depth: 0
@@ -81,10 +83,11 @@ jobs:
8183
run: |
8284
sh -c "echo \"deb [arch=amd64] http://robotpkg.openrobots.org/packages/debian/pub $(lsb_release -cs) robotpkg\" >> /etc/apt/sources.list "
8385
apt-key adv --fetch-keys http://robotpkg.openrobots.org/packages/debian/robotpkg.key
86+
8487
- name: Set and install dependencies
8588
run: |
86-
rm -rf /usr/local/share/boost/1.69.0
8789
export PYTHON3_VERSION=$(python3 -c "import sys; print(str(sys.version_info.major)+str(sys.version_info.minor))")
90+
# Force eigenpy 3.10.0 to be compatible with hpp-fcl
8891
export APT_DEPENDENCIES="doxygen \
8992
ccache \
9093
curl \
@@ -101,17 +104,19 @@ jobs:
101104
libboost-python-dev \
102105
python3-numpy \
103106
python3-matplotlib \
104-
robotpkg-py${PYTHON3_VERSION}-eigenpy \
107+
robotpkg-py${PYTHON3_VERSION}-eigenpy=3.10.0 \
105108
robotpkg-py${PYTHON3_VERSION}-hpp-fcl \
106109
robotpkg-py${PYTHON3_VERSION}-casadi"
107110
echo $APT_DEPENDENCIES
108111
109112
apt-get update -qq
110113
DEBIAN_FRONTEND="noninteractive" apt-get install -qq ${APT_DEPENDENCIES}
114+
111115
- name: Free disk space
112116
run: |
113117
apt clean
114118
df -h
119+
115120
- name: Run cmake
116121
run: |
117122
# Add cloned repo to safe.directory, since it was not cloned by the container
@@ -138,7 +143,7 @@ jobs:
138143
make -j2 build_tests
139144
export CTEST_OUTPUT_ON_FAILURE=1
140145
make test
141-
sudo make install
146+
make install
142147
143148
- name: Test packaging
144149
run: |
@@ -193,11 +198,10 @@ jobs:
193198
make -j2
194199
./run_fk
195200
196-
197201
- name: Uninstall project
198202
run: |
199203
cd build
200-
sudo make uninstall
204+
make uninstall
201205
202206
check:
203207
if: always()

.github/workflows/macos-linux-windows-pixi.yml

-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ jobs:
9292

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

CMakeLists.txt

+16-1
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,28 @@ endif()
6161
set(DOXYGEN_USE_MATHJAX YES)
6262
set(DOXYGEN_USE_TEMPLATE_CSS YES)
6363

64+
# ----------------------------------------------------
65+
# --- Policy -----------------------------------------
66+
# CMake Policy setup
67+
# ----------------------------------------------------
68+
# Policy can be removed when cmake_minimum_required is updated.
69+
70+
# We also set CMAKE_POLICY_DEFAULT_CMPXXXX because CMake modules can reset policy and redefine some
71+
# macros like `find_dependency` that will not use our policy.
72+
6473
# Use BoostConfig module distributed by boost library instead of using FindBoost module distributed
65-
# by CMake
74+
# by CMake (to remove in 3.30). This policy is not working when using clang-cl.
6675
if(NOT WIN32 OR NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
6776
if(POLICY CMP0167)
6877
cmake_policy(SET CMP0167 NEW)
78+
set(CMAKE_POLICY_DEFAULT_CMP0167 NEW)
6979
endif()
7080
endif()
81+
# install() DESTINATION paths are normalized (to remove in 3.31).
82+
if(POLICY CMP0177)
83+
cmake_policy(SET CMP0177 NEW)
84+
set(CMAKE_POLICY_DEFAULT_CMP0177 NEW)
85+
endif()
7186
include("${JRL_CMAKE_MODULES}/base.cmake")
7287

7388
compute_project_args(PROJECT_ARGS LANGUAGES CXX)

0 commit comments

Comments
 (0)