Skip to content

Commit

Permalink
docs: Using github actions to build docu
Browse files Browse the repository at this point in the history
  • Loading branch information
AndreasKuhner authored and BarisYazici committed Sep 13, 2024
1 parent 2bdcb96 commit 4e20c7e
Show file tree
Hide file tree
Showing 8 changed files with 75 additions and 66 deletions.
42 changes: 42 additions & 0 deletions .github/workflows/doxygen.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Generate Doxygen Documentation for libfranka

on:
push:
tags:
- '*'

jobs:
doxygen:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Install Doxygen
run: sudo apt-get install doxygen graphviz -y

- name: Generate Doxygen configuration and build it
run: |
TAG_NAME=$(echo $GITHUB_REF | sed 's/refs\/tags\///')
mkdir -p build/doc/docs/$TAG_NAME && cd build && cmake -D BUILD_DOCUMENTATION=ON -D SKIP_CXX_BUILD=ON .. && make doc
- name: Move contents of html folder one level up
run: |
TAG_NAME=$(echo $GITHUB_REF | sed 's/refs\/tags\///')
mv build/doc/docs/$TAG_NAME/html/* build/doc/docs/$TAG_NAME/
- name: Create index.html for redirect
run: |
TAG_NAME=$(echo $GITHUB_REF | sed 's/refs\/tags\///')
URL="https://frankaemika.github.io/libfranka/${TAG_NAME}/"
echo $URL
echo "<html><head><meta http-equiv=\"refresh\" content=\"0; url=$URL\"></head></html>" > build/doc/docs/index.html
- name: Deploy to GitHub Pages
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_branch: gh-pages
publish_dir: build/doc/docs
keep_files: true
45 changes: 0 additions & 45 deletions .travis.yml

This file was deleted.

24 changes: 15 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,21 @@

Requires Franka Research 3 system version >= 5.8.0

- Joint/Cartesian Pose velocity and acceleration errors are minimized.
- Joint position and cartesian pose examples can now start from the initial q or O_T_EE
- Joint position and cartesian pose low-pass filters are fixed to use the same command in the first package.
* Joint/Cartesian Pose velocity and acceleration errors are minimized.
* Joint position and cartesian pose examples can now start from the initial q or O_T_EE
* Joint position and cartesian pose low-pass filters are fixed to use the same command in the first package.

* **Important**: The flags `fci_joint_motion_generator_position_limits_violation_flag` and `fci_cartesian_motion_generator_joint_position_limits_violation_flag` are now always set to false and will be deprecated in future releases. They will be replaced by joint_position_limits_violation.

## 0.14.1 - 2024-09-06

* Added doxygen generation

## 0.14.0 - 2024-03-26

Requires Franka Research 3 system version >= 5.7.0

* Compute dynamic robot parameters with Pinocchio library.

## 0.13.5 - 2024-09-06

Expand All @@ -17,12 +29,6 @@ Requires Franka Research 3 system version >= 5.5.0

* Added package.xml for ros humble release

## 0.13.4 - 2024-03-26

Requires Franka Research 3 system version >= 5.7.0

* Compute dynamic robot parameters with Pinocchio library.

## 0.13.3 - 2024-01-18

Requires Franka Research 3 system version >= 5.5.0
Expand Down
15 changes: 10 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,16 @@ project(libfranka
LANGUAGES CXX
)

option(BUILD_DOCUMENTATION "Build documentation" OFF)
option(SKIP_CXX_BUILD "Skips the c++ build" OFF)
if(BUILD_DOCUMENTATION)
add_subdirectory(doc)

if(SKIP_CXX_BUILD)
return()
endif()
endif()

list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

set(CMAKE_CXX_STANDARD 17)
Expand Down Expand Up @@ -190,11 +200,6 @@ if(BUILD_EXAMPLES)
add_subdirectory(examples)
endif()

option(BUILD_DOCUMENTATION "Build documentation" OFF)
if(BUILD_DOCUMENTATION)
add_subdirectory(doc)
endif()

## Packaging
set(CPACK_PACKAGE_VENDOR "Franka Robotics GmbH")
set(CPACK_GENERATOR "DEB;TGZ")
Expand Down
5 changes: 1 addition & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# libfranka: C++ library for Franka Robotics research robots

[![Build Status][travis-status]][travis]
[![codecov][codecov-status]][codecov]

With this library, you can control research versions of Franka Robotics robots. See the [Franka Control Interface (FCI) documentation][fci-docs] for more information about what `libfranka` can do and how to set it up. The [generated API documentation][api-docs] also gives an overview of its capabilities.
Expand All @@ -10,9 +9,7 @@ With this library, you can control research versions of Franka Robotics robots.
`libfranka` is licensed under the [Apache 2.0 license][apache-2.0].

[apache-2.0]: https://www.apache.org/licenses/LICENSE-2.0.html
[api-docs]: https://frankaemika.github.io/libfranka
[api-docs]: https://frankaemika.github.io/libfranka/0.15.0
[fci-docs]: https://frankaemika.github.io/docs
[travis-status]: https://travis-ci.org/frankaemika/libfranka.svg?branch=master
[travis]: https://travis-ci.org/frankaemika/libfranka
[codecov-status]: https://codecov.io/gh/frankaemika/libfranka/branch/master/graph/badge.svg
[codecov]: https://codecov.io/gh/frankaemika/libfranka
4 changes: 4 additions & 0 deletions doc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ if(STRICT)
else()
set(DOXYGEN_WARN_AS_ERROR "NO")
endif()

# Create the directory for the output and configure the Doxyfile
set(DOXYGEN_OUTPUT_PATH "docs/${PROJECT_VERSION}")
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${DOXYGEN_OUTPUT_PATH})
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${DOXYFILE} @ONLY)

add_custom_target(doc ALL
Expand Down
2 changes: 1 addition & 1 deletion doc/Doxyfile.in
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ PROJECT_LOGO = @CMAKE_CURRENT_SOURCE_DIR@/Logo_FRANKA_ROBOTICS_dark.pn
# entered, it will be relative to the location where doxygen was started. If
# left blank the current directory will be used.

OUTPUT_DIRECTORY =
OUTPUT_DIRECTORY = "@DOXYGEN_OUTPUT_PATH@"

# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
# directories (in 2 levels) under the output directory of each output format and
Expand Down
4 changes: 2 additions & 2 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>libfranka</name>
<version>0.14.0</version>
<version>0.15.0</version>
<description>libfranka is a C++ library for Franka Robotics research robots</description>
<maintainer email="support@franka.de">Franka Robotics GmbH</maintainer>
<license>Apache 2.0</license>
Expand All @@ -29,4 +29,4 @@
<export>
<build_type>cmake</build_type>
</export>
</package>
</package>

0 comments on commit 4e20c7e

Please sign in to comment.