Skip to content

Commit

Permalink
Merge branch 'master' into release-3.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
phannebohm committed Feb 5, 2024
2 parents 1ea76ba + 2df1b91 commit cb7596d
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 4 deletions.
28 changes: 26 additions & 2 deletions .github/workflows/Test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
pull_request:
push:
branches:
- main
- master
- 'releases/*'
tags: 'v*'

Expand Down Expand Up @@ -41,10 +41,34 @@ jobs:
uses: OpenModelica/[email protected]
with:
library: PNlib
library-version: '2.2'
library-version: 'master'
modelica-file: PNlib/package.mo
omc-version: ${{ matrix.omc-version }}
reference-files-dir: ReferenceFiles
reference-files-extension: mat
reference-files-delimiter: .

deploy:
needs: test
permissions:
contents: write
if: endsWith(github.ref, 'master')
concurrency: ci-${{ github.ref }} # Recommended if you intend to make multiple deployments in quick succession.
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Get HTML artifact
uses: actions/download-artifact@v4
with:
path: html-artifacts/
pattern: '*.html'
merge-multiple: true

- name: Deploy 🚀
uses: JamesIves/github-pages-deploy-action@v4
with:
folder: html-artifacts/
branch: gh-pages
9 changes: 7 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,15 @@ Download [PNlib v2.2 (2019-10-24)][release-v-2-2]

## Compatibility

* Works in OpenModelica (latest release)
* Coverage with OpenModelica master and latest PNlib release:

![Pnlib omc-master](https://libraries.openmodelica.org/branches/history/master/PNlib.svg)

Latest [Coverage][coverage-link] with OpenModelica.
* OpenModelica coverage reports:

* Release: [Nightly coverage reports][coverage-link]
* Master: [Latest commit][gh-pages-link]

* Works in Dymola 2017/2019/2020

## License
Expand Down Expand Up @@ -65,3 +69,4 @@ You may report feedback, issues or feature-requests using
[coverage-link]: http://libraries.openmodelica.org/branches/master/PNlib/PNlib.html
[license-link]: https://modelica.org/licenses/ModelicaLicense2
[issues]: https://github.com/AMIT-HSBI/PNlib/issues
[gh-pages-link]: https://amit-hsbi.github.io/PNlib/stable/PNlib_master/PNlib_master.html

0 comments on commit cb7596d

Please sign in to comment.