Skip to content

Commit

Permalink
Merge pull request 3MFConsortium#280 from 3MFConsortium/release/2.2.0
Browse files Browse the repository at this point in the history
release/2.2.0
  • Loading branch information
martinweismann committed Aug 24, 2021
2 parents a88abf0 + 00babab commit 30d5c2e
Show file tree
Hide file tree
Showing 117 changed files with 126,152 additions and 874 deletions.
2 changes: 2 additions & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
fixes:
- "Users/runner/work::" # move path
35 changes: 31 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,19 @@ jobs:
with:
name: lib3mf.so
path: build/lib3mf.so.2
- run: zip -r bindings.zip Bindings
working-directory: ./build/Autogenerated
- run: zip -r build/bindings.zip Autogenerated/Bindings
- name: Archive bindings
uses: actions/upload-artifact@v2
with:
name: bindings.zip
path: build/Autogenerated/bindings.zip
path: build/bindings.zip
build-macos:
runs-on: macos-10.15
steps:
- uses: actions/checkout@v2
with:
submodules: true
- run: sh cmake/GenerateMake.sh
- run: sh cmake/GenerateMake.sh "-DCMAKE_OSX_ARCHITECTURES=arm64;x86_64"
- run: cmake --build .
working-directory: ./build
- run: ctest -V
Expand All @@ -41,6 +40,34 @@ jobs:
with:
name: lib3mf.dylib
path: build/lib3mf.dylib

codecoverage-macos:
runs-on: macos-10.15
steps:
- uses: actions/checkout@v2
with:
submodules: true
- name: Install Prerequisites
run: |
brew install lcov
brew install gcovr
- run: sh cmake/GenerateMake.sh -DBUILD_FOR_CODECOVERAGE=ON
- run: cmake --build .
working-directory: ./build
- run: ./Tests/codecoverage/run_codecoverage.sh
- name: Archive Code Coverage Results
uses: actions/upload-artifact@v2
with:
name: codecoverage.zip
path: build/codecoverage.zip
- name: Upload code coverage to codecov
uses: codecov/codecov-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./build/Test_CPP_Bindings_filtered.info
fail_ci_if_error: true # optional (default = false)
verbose: true # optional (default = false)

build-windows-release:
runs-on: windows-2019
steps:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ build_32bit
lib3MF.pc
Include/Model/COM/NMR_COMVersion.h
debug
.DS_Store
Loading

0 comments on commit 30d5c2e

Please sign in to comment.