Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/2.3.1 into develop #354

Merged
merged 11 commits into from
Apr 2, 2024
Merged

Release/2.3.1 into develop #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c6aa869
Merge pull request #352 from 3MFConsortium/release/2.3.0
martinweismann Mar 12, 2024
08feef2
Update README.md
gangatp Mar 12, 2024
a77059c
removing alpha
gangatp Mar 13, 2024
0f84254
replacing 2.3.0 to 2.3.1
gangatp Mar 13, 2024
d7aa426
changing readme
gangatp Mar 14, 2024
8eca08f
adding debug artifacts
gangatp Mar 14, 2024
264d9ed
updating readthedocs config file
gangatp Mar 14, 2024
52a3f26
updating readthedocs config file
gangatp Mar 14, 2024
d4fab5e
updating readthedocs config file
gangatp Mar 14, 2024
ded8fb7
Merge branch 'master' into release/2.3.1
gangatp Mar 14, 2024
23a0a89
Merge branch 'develop' into release/2.3.1
gangatp Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,24 @@ jobs:
with:
name: lib3mf.dylib
path: build/lib3mf.dylib

build-macos-debug:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
with:
submodules: true
- run: sh cmake/GenerateMake.sh "-DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 -DCMAKE_BUILD_TYPE=Debug"
- run: cmake --build .
working-directory: ./build
- run: ctest -V
working-directory: ./build
- name: Archive Mac binary
uses: actions/upload-artifact@v2
with:
name: lib3mf.debug.dylib
path: build/lib3mf.dylib

codecoverage-macos:
runs-on: macos-latest
steps:
Expand Down Expand Up @@ -139,6 +157,14 @@ jobs:
with:
name: lib3mf.debug.dll
path: build/Debug/lib3mf.dll
- uses: actions/upload-artifact@v2
with:
name: lib3mf.pdb
path: build/Debug/lib3mf.pdb
- uses: actions/upload-artifact@v2
with:
name: lib3mf.debug.lib
path: build/Debug/lib3mf.lib
build-windows-32bit:
runs-on: windows-2019
steps:
Expand Down
7 changes: 6 additions & 1 deletion .readthedocs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
# Required
version: 2


build:
os: ubuntu-22.04
tools:
python: "3.7"

# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: Documentation/conf.py
Expand All @@ -16,6 +22,5 @@ formats:
- htmlzip

python:
version: 3.7
install:
- requirements: Documentation/requirements.txt
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/C/lib3mf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated plain C Header file in order to allow an easy
use of the 3MF Library

Interface version: 2.3.0
Interface version: 2.3.1

*/

Expand Down
4 changes: 2 additions & 2 deletions Autogenerated/Bindings/C/lib3mf_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated plain C Header file with basic types in
order to allow an easy use of the 3MF Library

Interface version: 2.3.0
Interface version: 2.3.1

*/

Expand Down Expand Up @@ -85,7 +85,7 @@ typedef void * Lib3MF_pvoid;

#define LIB3MF_VERSION_MAJOR 2
#define LIB3MF_VERSION_MINOR 3
#define LIB3MF_VERSION_MICRO 0
#define LIB3MF_VERSION_MICRO 1
#define LIB3MF_VERSION_PRERELEASEINFO ""
#define LIB3MF_VERSION_BUILDINFO ""

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/CDynamic/lib3mf_dynamic.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated plain C Header file in order to allow an easy
use of the 3MF Library

Interface version: 2.3.0
Interface version: 2.3.1

*/

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/CDynamic/lib3mf_dynamic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated plain C Header file in order to allow an easy
use of the 3MF Library

Interface version: 2.3.0
Interface version: 2.3.1

*/

Expand Down
4 changes: 2 additions & 2 deletions Autogenerated/Bindings/CDynamic/lib3mf_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated plain C Header file with basic types in
order to allow an easy use of the 3MF Library

Interface version: 2.3.0
Interface version: 2.3.1

*/

Expand Down Expand Up @@ -85,7 +85,7 @@ typedef void * Lib3MF_pvoid;

#define LIB3MF_VERSION_MAJOR 2
#define LIB3MF_VERSION_MINOR 3
#define LIB3MF_VERSION_MICRO 0
#define LIB3MF_VERSION_MICRO 1
#define LIB3MF_VERSION_PRERELEASEINFO ""
#define LIB3MF_VERSION_BUILDINFO ""

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/CSharp/Lib3MF.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated CSharp file in order to allow an easy
use of the 3MF Library

Interface version: 2.3.0
Interface version: 2.3.1

*/

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/Cpp/lib3mf_abi.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated C++-Header file in order to allow an easy
use of the 3MF Library

Interface version: 2.3.0
Interface version: 2.3.1

*/

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/Cpp/lib3mf_implicit.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated C++-Header file in order to allow an easy
use of the 3MF Library

Interface version: 2.3.0
Interface version: 2.3.1

*/

Expand Down
4 changes: 2 additions & 2 deletions Autogenerated/Bindings/Cpp/lib3mf_types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated C++-Header file with basic types in
order to allow an easy use of the 3MF Library

Interface version: 2.3.0
Interface version: 2.3.1

*/

Expand Down Expand Up @@ -84,7 +84,7 @@ typedef void * Lib3MF_pvoid;

#define LIB3MF_VERSION_MAJOR 2
#define LIB3MF_VERSION_MINOR 3
#define LIB3MF_VERSION_MICRO 0
#define LIB3MF_VERSION_MICRO 1
#define LIB3MF_VERSION_PRERELEASEINFO ""
#define LIB3MF_VERSION_BUILDINFO ""

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/CppDynamic/lib3mf_abi.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated C++-Header file in order to allow an easy
use of the 3MF Library

Interface version: 2.3.0
Interface version: 2.3.1

*/

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated C++-Header file in order to allow an easy
use of the 3MF Library

Interface version: 2.3.0
Interface version: 2.3.1

*/

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated C++-Header file in order to allow an easy
use of the 3MF Library

Interface version: 2.3.0
Interface version: 2.3.1

*/

Expand Down
4 changes: 2 additions & 2 deletions Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated C++-Header file with basic types in
order to allow an easy use of the 3MF Library

Interface version: 2.3.0
Interface version: 2.3.1

*/

Expand Down Expand Up @@ -84,7 +84,7 @@ typedef void * Lib3MF_pvoid;

#define LIB3MF_VERSION_MAJOR 2
#define LIB3MF_VERSION_MINOR 3
#define LIB3MF_VERSION_MICRO 0
#define LIB3MF_VERSION_MICRO 1
#define LIB3MF_VERSION_PRERELEASEINFO ""
#define LIB3MF_VERSION_BUILDINFO ""

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/Go/cfunc.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Autogenerated/Bindings/Go/lib3mf.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Autogenerated/Bindings/Go/lib3mf_dynamic.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated plain C Header file in order to allow an easy
use of the 3MF Library

Interface version: 2.3.0
Interface version: 2.3.1

*/

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/Go/lib3mf_dynamic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated plain C Header file in order to allow an easy
use of the 3MF Library

Interface version: 2.3.0
Interface version: 2.3.1

*/

Expand Down
Loading
Loading