Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
DanielChappuis committed Jun 23, 2024
2 parents c2201c5 + 6344272 commit c76b929
Show file tree
Hide file tree
Showing 74 changed files with 5,054 additions and 3,230 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ on:
- master
- develop
pull_request:
release:
workflow_call:
secrets:
codecov_token:
required: true

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
Expand Down Expand Up @@ -306,8 +309,8 @@ jobs:
- name: Upload coverage to Codecov
if: ${{ matrix.config.coverage }}
uses: codecov/codecov-action@v2
uses: codecov/codecov-action@v4
with:
fail_ci_if_error: true
token: ${{ secrets.codecov_token }}
verbose: false

49 changes: 49 additions & 0 deletions .github/workflows/publish-documentation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# Build the Doxygen documentation (User manual and API reference) and publish it to www.reactphysics3d.com website
name: Publish Documentation

# Controls when the action will run. Triggers the workflow on push
on:
push:
branches:
- master

jobs:
documentation:
name: Build/Publish Documentation
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install cmake doxygen texlive-latex-extra ghostscript
cmake --version
doxygen --version
- name: CMake Configure
shell: bash
run: |
mkdir build
cmake \
-S . \
-B build \
-DRP3D_COMPILE_LIBRARY=False \
-DRP3D_GENERATE_DOCUMENTATION=True \
-DRP3D_COMPILE_TESTS=False \
-DRP3D_COMPILE_TESTBED=False
- name: Build Documentation
shell: bash
run: cmake --build build/

- name: Publish to FTP of website
uses: SamKirkland/[email protected]
with:
server: ftp.cluster010.ovh.net
username: ${{ secrets.ftp_username }}
password: ${{ secrets.ftp_password }}
local-dir: ./build/documentation/html/
server-dir: /wwwrp3d/documentation/
dangerous-clean-slate: true
38 changes: 38 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Build, run tests and create a new release using the CHANGELOG.md file as release notes
name: release

# Controls when the action will run. Triggers the workflow on push with a release tag
on:
push:
tags:
- "v[0-9]+.[0-9]+.[0-9]+"

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:

# Reuse the workflow to build and test the library
build-and-test:
name: Build and Test
uses: ./.github/workflows/build-and-test.yml
secrets:
codecov_token: ${{ secrets.CODECOV_TOKEN }}

# Create a new release
create-release:
name: Create Release
runs-on: ubuntu-latest
needs: [build-and-test]
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Build Documentation
uses: docker://antonyurchenko/git-release:v6
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DRAFT_RELEASE: "false"
PRE_RELEASE: "false"
ALLOW_EMPTY_CHANGELOG: "false"



3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@
path = testbed/extern/nanogui
url = https://github.com/mitsuba-renderer/nanogui.git
ignore = dirty
[submodule "documentation/doxygen-awesome-css"]
path = documentation/doxygen-awesome-css
url = https://github.com/jothepro/doxygen-awesome-css.git
598 changes: 309 additions & 289 deletions CHANGELOG.md

Large diffs are not rendered by default.

Loading

0 comments on commit c76b929

Please sign in to comment.