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

Release/5.2.0 #27

Merged
merged 26 commits into from
Oct 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
dc26af3
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Jul 1, 2024
c754510
nix: update after v5.1.0
nim65s Jul 2, 2024
5d5bce5
nix ci: cachix only on HPP org
nim65s Jul 2, 2024
af945f9
Merge branch 'devel' into pre-commit-ci-update-config
nim65s Jul 4, 2024
6fa9a8d
pre-commit autoupdate
nim65s Jul 4, 2024
7768ffb
Merge branch 'devel' into pre-commit-ci-update-config
nim65s Jul 4, 2024
80a0bcd
Merge pull request #19 from humanoid-path-planner/pre-commit-ci-updat…
nim65s Jul 4, 2024
3a20918
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Jul 8, 2024
c352985
Merge pull request #20 from humanoid-path-planner/pre-commit-ci-updat…
nim65s Jul 9, 2024
cf5c1fb
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Jul 29, 2024
5c2f9c1
Merge pull request #21 from humanoid-path-planner/pre-commit-ci-updat…
nim65s Jul 30, 2024
9f51b5c
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Sep 2, 2024
02c0ae4
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 2, 2024
ebca046
Merge pull request #22 from humanoid-path-planner/pre-commit-ci-updat…
nim65s Sep 2, 2024
4513229
CMake: python option
nim65s Sep 11, 2024
01ff108
Merge pull request #24 from nim65s/py
nim65s Oct 1, 2024
6739829
nix: move package to nixpkgs
nim65s Oct 7, 2024
b3dad75
nix: temporary patches override
nim65s Oct 7, 2024
f4176c2
git rm default.nix
nim65s Oct 7, 2024
a54aadf
setup mergify
nim65s Oct 7, 2024
8ef3d8f
Merge pull request #26 from humanoid-path-planner/mergify
nim65s Oct 7, 2024
519b941
Merge branch 'devel' into nix
nim65s Oct 7, 2024
0d73bb5
Merge pull request #25 from humanoid-path-planner/nix
nim65s Oct 7, 2024
dde983b
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Oct 7, 2024
110d996
Merge pull request #23 from humanoid-path-planner/pre-commit-ci-updat…
nim65s Oct 7, 2024
3719f4f
sync submodule
nim65s Oct 8, 2024
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
17 changes: 9 additions & 8 deletions .github/workflows/nix.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: "Nix CI"
name: "CI - Nix"

on: [pull_request, push]
on:
push:

jobs:
tests:
Expand All @@ -11,9 +12,9 @@ jobs:
os: [ubuntu]
steps:
- uses: actions/checkout@v4
- uses: DeterminateSystems/nix-installer-action@main
- uses: DeterminateSystems/magic-nix-cache-action@main
- run: nix --accept-flake-config build -L
- run: nix --accept-flake-config run .#cachix push gepetto $(readlink result)
env:
CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
- uses: cachix/install-nix-action@v27
- uses: cachix/cachix-action@v15
with:
name: gepetto
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- run: nix build -L
11 changes: 11 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
pull_request_rules:
- name: merge automatically when CI passes and PR is approved
conditions:
- check-success = "gitlab-ci"
- check-success = "Nix build on ubuntu"
- check-success = "pre-commit.ci - pr"
- or:
- author = pre-commit-ci[bot]
- author = dependabot[bot]
actions:
merge:
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ci:
autoupdate_branch: devel
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.5.0
rev: v0.6.9
hooks:
- id: ruff
args:
Expand All @@ -19,13 +19,13 @@ repos:
- id: toml-sort-fix
exclude: poetry.lock
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v18.1.7
rev: v19.1.1
hooks:
- id: clang-format
args:
- --style=Google
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: check-added-large-files
- id: check-ast
Expand Down
39 changes: 25 additions & 14 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@ cmake_minimum_required(VERSION 3.10)
set(PROJECT_NAME hpp_romeo)
set(PROJECT_DESCRIPTION "Python and ros launch files for Romeo robot in hpp.")

set(PROJECT_USE_CMAKE_EXPORT TRUE)
option(BUILD_PYTHON_INTERFACE "Build the python bindings" ON)
option(INSTALL_PYTHON_INTERFACE_ONLY "Install *ONLY* the python bindings" OFF)

if(NOT INSTALL_PYTHON_INTERFACE_ONLY)
set(PROJECT_USE_CMAKE_EXPORT TRUE)
endif(NOT INSTALL_PYTHON_INTERFACE_ONLY)

# Check if the submodule cmake have been initialized
set(JRL_CMAKE_MODULES "${CMAKE_CURRENT_LIST_DIR}/cmake")
Expand Down Expand Up @@ -46,23 +51,29 @@ include("${JRL_CMAKE_MODULES}/python.cmake")
compute_project_args(PROJECT_ARGS LANGUAGES CXX)
project(${PROJECT_NAME} ${PROJECT_ARGS})

findpython()
if(BUILD_PYTHON_INTERFACE)
findpython(REQUIRED)
endif(BUILD_PYTHON_INTERFACE)

add_project_dependency("hpp-corbaserver" REQUIRED)
add_project_dependency("example-robot-data" REQUIRED)

install(FILES src/hpp/corbaserver/romeo/robot.py
src/hpp/corbaserver/romeo/__init__.py
DESTINATION ${PYTHON_SITELIB}/hpp/corbaserver/romeo)
if(BUILD_PYTHON_INTERFACE)
install(FILES src/hpp/corbaserver/romeo/robot.py
src/hpp/corbaserver/romeo/__init__.py
DESTINATION ${PYTHON_SITELIB}/hpp/corbaserver/romeo)

install(FILES src/hpp/corbaserver/manipulation/romeo/robot.py
src/hpp/corbaserver/manipulation/romeo/__init__.py
DESTINATION ${PYTHON_SITELIB}/hpp/corbaserver/manipulation/romeo)
install(FILES src/hpp/corbaserver/manipulation/romeo/robot.py
src/hpp/corbaserver/manipulation/romeo/__init__.py
DESTINATION ${PYTHON_SITELIB}/hpp/corbaserver/manipulation/romeo)
endif()

install(FILES package.xml DESTINATION share/${PROJECT_NAME})
if(NOT INSTALL_PYTHON_INTERFACE_ONLY)
install(FILES package.xml DESTINATION share/${PROJECT_NAME})

add_library(${PROJECT_NAME} INTERFACE)
install(
TARGETS ${PROJECT_NAME}
EXPORT ${TARGETS_EXPORT_NAME}
DESTINATION lib)
add_library(${PROJECT_NAME} INTERFACE)
install(
TARGETS ${PROJECT_NAME}
EXPORT ${TARGETS_EXPORT_NAME}
DESTINATION lib)
endif()
41 changes: 0 additions & 41 deletions default.nix

This file was deleted.

Loading