Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into precice-v3
Browse files Browse the repository at this point in the history
  • Loading branch information
fsimonis committed Nov 16, 2023
2 parents f71bbf8 + 0aef9e1 commit 50dac98
Show file tree
Hide file tree
Showing 6 changed files with 84 additions and 4 deletions.
77 changes: 77 additions & 0 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
name: Build and deploy the testing website
on:
workflow_dispatch:
push:
branches:
- precice-v3

jobs:
build-deploy:
runs-on: ubuntu-20.04
steps:
- name: Checkout website
uses: actions/checkout@v2
with:
submodules: true
lfs: false
path: website

- name: Fetch - precice develop
uses: actions/checkout@v2
with:
repository: precice/precice
ref: develop
path: develop

- name: Fetch - precice main
uses: actions/checkout@v2
with:
repository: precice/precice
ref: main
path: main

- name: Install dependencies
run: |
sudo apt-get -yyq update
sudo apt-get -yyq install doxygen graphviz plantuml
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
bundler-cache: true
working-directory: website

- name: Build website
working-directory: website
env:
JEKYLL_ENV: production
run: bundle exec jekyll build

- name: Build doxygen - develop
working-directory: develop
run: doxygen
env:
PLANTUML_JAR_PATH: /usr/share/plantuml/plantuml.jar

- name: Build doxygen - main
working-directory: main
run: doxygen
env:
PLANTUML_JAR_PATH: /usr/share/plantuml/plantuml.jar

- name: Assemble website
run: |
mv website/_site public
mv develop/docs/source-code-documentation/html public/doxygen/develop
mv main/docs/source-code-documentation/html public/doxygen/main
- name: List website files
run: find public

- name: Deploy to testing
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.JEKYLL_PAT }}
publish_dir: ./public
external_repository: precice/website-testing
publish_branch: main
3 changes: 3 additions & 0 deletions pages/docs/couple-your-code/couple-your-code-porting-v2-3.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ Please add breaking changes here when merged to the `develop` branch.

<!-- Split code block. See https://github.com/precice/precice.github.io/commit/74e377cece4a221e00b5c56b1db3942ec70a6272. -->
```diff
- #include "precice/SolverInterface.hpp"
+ #include "precice/Participant.hpp"

turnOnSolver(); //e.g. setup and partition mesh

- precice::SolverInterface precice("FluidSolver","precice-config.xml",rank,size); // constructor
Expand Down

0 comments on commit 50dac98

Please sign in to comment.