Improvements to CMake + Introduction of CPack based packages #346
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,9 @@ | ||
| on: [push, pull_request] | ||
| env: | ||
| LIB3MF_VERSION: "2.3.0" | ||
| name: Build | ||
| jobs: | ||
|
|
||
| build-linux-memtest: | ||
| runs-on: ubuntu-20.04 | ||
| steps: | ||
|
|
@@ -23,41 +26,65 @@ jobs: | |
| submodules: true | ||
| - run: mkdir -p build | ||
| - run: zip -r build/bindings.zip Autogenerated/Bindings | ||
| - name: Archive bindings | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
| name: bindings.zip | ||
| path: build/bindings.zip | ||
| - name: Set up Docker Buildx | ||
| uses: docker/setup-buildx-action@v3 | ||
| - name: Docker Build | ||
| uses: docker/build-push-action@v5 | ||
| with: | ||
| context: . | ||
| file: ./CI/Dockerfile | ||
| platforms: linux/amd64 | ||
| tags: lib3mf_ubi8:latest | ||
| load: true | ||
| - name: Docker Extract | ||
| uses: shrink/[email protected] | ||
| id: extract | ||
| with: | ||
| image: lib3mf_ubi8:latest | ||
| path: out.zip | ||
| destination: dist | ||
| - run: unzip out.zip | ||
| working-directory: ./dist | ||
| - name: Upload Artifact | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
| name: lib3mf.so | ||
| path: dist/lib3mf.so.2 | ||
| - name: Extract File Name (CPacked Archive) | ||
|
There was a problem hiding this comment. Is this Archive still necessary ? |
||
| run: | | ||
| ZIP_FILE=$(ls dist/lib3mf-*.zip) | ||
| echo "ARTIFACT_NAME_ZIP=$(basename ${ZIP_FILE})" >> $GITHUB_ENV | ||
| shell: bash | ||
| - name: Upload Artifact (CPacked Archive) | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
| name: ${{ env.ARTIFACT_NAME_ZIP }} | ||
| path: dist/${{ env.ARTIFACT_NAME_ZIP }} | ||
| - name: Extract File Name (Debian) | ||
| run: | | ||
| DEB_FILE=$(ls dist/lib3mf-*.deb) | ||
| echo "ARTIFACT_NAME_DEB=$(basename ${DEB_FILE})" >> $GITHUB_ENV | ||
| shell: bash | ||
| - name: Upload Artifact (Debian Archive) | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
| name: ${{ env.ARTIFACT_NAME_DEB }} | ||
| path: dist/${{ env.ARTIFACT_NAME_DEB }} | ||
| - name: Extract File Name (RPM) | ||
| run: | | ||
| RPM_FILE=$(ls dist/lib3mf-*.rpm) | ||
| echo "ARTIFACT_NAME_RPM=$(basename ${RPM_FILE})" >> $GITHUB_ENV | ||
| shell: bash | ||
| - name: Upload Artifact (RPM Archive) | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
| name: ${{ env.ARTIFACT_NAME_RPM }} | ||
| path: dist/${{ env.ARTIFACT_NAME_RPM }} | ||
|
|
||
| build-macos: | ||
| runs-on: macos-latest | ||
|
|
@@ -70,11 +97,24 @@ jobs: | |
| working-directory: ./build | ||
| - run: ctest -V | ||
| working-directory: ./build | ||
| - run: cpack -G ZIP -C Release | ||
| working-directory: ./build | ||
| - name: Extract File Name | ||
| run: | | ||
| ZIP_FILE=$(ls build/lib3mf-*.zip) | ||
| echo "ARTIFACT_NAME=$(basename ${ZIP_FILE})" >> $GITHUB_ENV | ||
| shell: bash | ||
| - name: Archive Mac binary | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
| name: lib3mf.dylib | ||
| path: build/lib3mf.dylib | ||
| - name: Upload Artifact (CPacked Archive) | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
| name: ${{ env.ARTIFACT_NAME }} | ||
| path: build/${{ env.ARTIFACT_NAME }} | ||
|
|
||
| codecoverage-macos: | ||
| runs-on: macos-latest | ||
| steps: | ||
|
|
@@ -113,6 +153,13 @@ jobs: | |
| working-directory: ./build | ||
| - run: ctest -V | ||
| working-directory: ./build | ||
| - run: cpack -G ZIP -C Release | ||
| working-directory: ./build | ||
| - name: Extract File Name | ||
| run: | | ||
| $zipFile = Get-ChildItem build\lib3mf-*.zip -Name | ||
| echo "ARTIFACT_NAME=$zipFile" | Out-File -FilePath $env:GITHUB_ENV -Append | ||
| shell: pwsh | ||
| - name: Archive Windows Release binary | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
|
|
@@ -123,6 +170,12 @@ jobs: | |
| with: | ||
| name: lib3mf.lib | ||
| path: build/Release/lib3mf.lib | ||
| - name: Upload Artifact (CPacked Archive) | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
| name: ${{ env.ARTIFACT_NAME }} | ||
| path: build/${{ env.ARTIFACT_NAME }} | ||
|
|
||
| build-windows-debug: | ||
| runs-on: windows-2019 | ||
| steps: | ||
|
|
@@ -172,6 +225,8 @@ jobs: | |
| working-directory: ./build | ||
| - run: ctest -V | ||
| working-directory: ./build | ||
|
|
||
|
|
||
| assemble-sdk: | ||
| runs-on: ubuntu-20.04 | ||
| needs: [build-windows-release, build-macos, build-linux-ubi8-gcc12] | ||
|
|
@@ -189,16 +244,43 @@ jobs: | |
| - run: unzip bindings.zip/bindings.zip | ||
| working-directory: ./build | ||
| - run: bash SDK/GenerateSDK_github.sh | ||
| - name: Archive SDK artifact (Comprehensive) | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
| name: lib3mf_sdk.zip | ||
| path: build/lib3mf_sdk.zip | ||
| - name: Archive SDK artifact (CPack - Linux) | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
| name: lib3mf-${{ env.LIB3MF_VERSION }}-Linux.zip | ||
| path: build/lib3mf-${{ env.LIB3MF_VERSION }}-Linux.zip | ||
| - name: Archive SDK artifact (CPack - Windows) | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
| name: lib3mf-${{ env.LIB3MF_VERSION }}-Windows.zip | ||
| path: build/lib3mf-${{ env.LIB3MF_VERSION }}-Windows.zip | ||
| - name: Archive SDK artifact (CPack - Darwin) | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
| name: lib3mf-${{ env.LIB3MF_VERSION }}-Darwin.zip | ||
| path: build/lib3mf-${{ env.LIB3MF_VERSION }}-Darwin.zip | ||
| - name: Archive SDK artifact (CPack - Debian) | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
| name: lib3mf-${{ env.LIB3MF_VERSION }}-Linux.deb | ||
| path: build/lib3mf-${{ env.LIB3MF_VERSION }}-Linux.deb | ||
| - name: Archive SDK artifact (CPack - RPM) | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
| name: lib3mf-${{ env.LIB3MF_VERSION }}-Linux.rpm | ||
| path: build/lib3mf-${{ env.LIB3MF_VERSION }}-Linux.rpm | ||
|
|
||
|
|
||
| deploy-linux: | ||
| runs-on: ubuntu-20.04 | ||
| needs: [assemble-sdk] | ||
| steps: | ||
| - run: sudo apt install -y zip unzip file | ||
| - run: pwd | ||
| - run: ls -Rl . | ||
| - name: Download lib3mf_sdk artifact | ||
|
|
@@ -222,6 +304,54 @@ jobs: | |
| cd Examples/Cpp/build | ||
| cmake --build . | ||
| ./Example_ExtractInfo ../../Files/Helix.3mf | ||
| - name: Download lib3mf cpack (Linux) | ||
| uses: actions/download-artifact@v2 | ||
| with: | ||
| name: lib3mf-${{ env.LIB3MF_VERSION }}-Linux.zip | ||
| path: lib3mf-${{ env.LIB3MF_VERSION }}-Linux.zip | ||
| - run: ls -Rl . | ||
| - name: Unpack the cpacked SDK | ||
| run: | | ||
| unzip lib3mf-${{ env.LIB3MF_VERSION }}-Linux.zip/lib3mf-${{ env.LIB3MF_VERSION }}-Linux.zip | ||
| - name: Build CppDynamicNew | ||
| run: | | ||
| sh Examples/CppDynamicNew/GenerateMake.sh | ||
| cd Examples/CppDynamicNew/build | ||
| cmake --build . | ||
| ./Example_ExtractInfo ../../Files/Helix.3mf | ||
| - name: Build CppNew | ||
| run: | | ||
| sh Examples/CppNew/GenerateMake.sh | ||
| cd Examples/CppNew/build | ||
| cmake --build . | ||
| ./Example_ExtractInfo ../../Files/Helix.3mf | ||
| - name: Download lib3mf (Debian Linux) | ||
| uses: actions/download-artifact@v2 | ||
| with: | ||
| name: lib3mf-${{ env.LIB3MF_VERSION }}-Linux.deb | ||
| path: lib3mf-${{ env.LIB3MF_VERSION }}-Linux.deb | ||
| - name: Check the file type | ||
| run: | | ||
| file lib3mf-${{ env.LIB3MF_VERSION }}-Linux.deb | ||
| file lib3mf-${{ env.LIB3MF_VERSION }}-Linux.deb/lib3mf-${{ env.LIB3MF_VERSION }}-Linux.deb | ||
| - run: pwd | ||
| - run: ls -Rl . | ||
| - name: Install the debian package | ||
| run: | | ||
| sudo dpkg -i lib3mf-${{ env.LIB3MF_VERSION }}-Linux.deb/lib3mf-${{ env.LIB3MF_VERSION }}-Linux.deb | ||
| - name: Build CppDynamicNew (Debian) | ||
| run: | | ||
| sh Examples/CppDynamicNew/GenerateMake.sh | ||
| cd Examples/CppDynamicNew/build | ||
| cmake --build . | ||
| ./Example_ExtractInfo ../../Files/Helix.3mf | ||
| - name: Build CppNew (Debian) | ||
| run: | | ||
| sh Examples/CppNew/GenerateMake.sh | ||
| cd Examples/CppNew/build | ||
| cmake --build . | ||
| ./Example_ExtractInfo ../../Files/Helix.3mf | ||
|
|
||
| deploy-windows: | ||
| runs-on: windows-2019 | ||
| needs: [assemble-sdk] | ||
|
|
@@ -246,6 +376,27 @@ jobs: | |
| cd Examples/Cpp/build | ||
| cmake --build . --config Release | ||
| ./Release/Example_ExtractInfo.exe ../../Files/Helix.3mf | ||
| - name: Download lib3mf cpack (Windows) | ||
| uses: actions/download-artifact@v2 | ||
| with: | ||
| name: lib3mf-${{ env.LIB3MF_VERSION }}-Windows.zip | ||
| path: lib3mf-${{ env.LIB3MF_VERSION }}-Windows.zip | ||
| - name: Unpack the cpacked SDK | ||
| run: | | ||
| unzip lib3mf-${{ env.LIB3MF_VERSION }}-Windows.zip/lib3mf-${{ env.LIB3MF_VERSION }}-Windows.zip | ||
| - name: Build CppDynamic (Windows) | ||
| run: | | ||
| ./Examples/CppDynamic/GenerateVS2019.bat | ||
| cd Examples/CppDynamic/build | ||
| cmake --build . --config Release | ||
| ./Release/Example_ExtractInfo.exe ../../Files/Helix.3mf | ||
| - name: Build Cpp (Windows) | ||
| run: | | ||
| ./Examples/Cpp/GenerateVS2019.bat | ||
| cd Examples/Cpp/build | ||
| cmake --build . --config Release | ||
| ./Release/Example_ExtractInfo.exe ../../Files/Helix.3mf | ||
|
|
||
| deploy-macos: | ||
| runs-on: macos-latest | ||
| needs: [assemble-sdk] | ||
|
|
@@ -269,4 +420,25 @@ jobs: | |
| sh Examples/Cpp/GenerateMake.sh | ||
| cd Examples/Cpp/build | ||
| cmake --build . | ||
| ./Example_ExtractInfo ../../Files/Helix.3mf | ||
| - name: Download lib3mf cpack (Darwin) | ||
| uses: actions/download-artifact@v2 | ||
| with: | ||
| name: lib3mf-${{ env.LIB3MF_VERSION }}-Darwin.zip | ||
| path: lib3mf-${{ env.LIB3MF_VERSION }}-Darwin.zip | ||
| - run: ls -Rl . | ||
| - name: Unpack the cpacked SDK (Darwin) | ||
| run: | | ||
| unzip lib3mf-${{ env.LIB3MF_VERSION }}-Darwin.zip/lib3mf-${{ env.LIB3MF_VERSION }}-Darwin.zip | ||
| - name: Build CppDynamicNew (Darwin) | ||
| run: | | ||
| sh Examples/CppDynamicNew/GenerateMake.sh | ||
| cd Examples/CppDynamicNew/build | ||
| cmake --build . | ||
| ./Example_ExtractInfo ../../Files/Helix.3mf | ||
| - name: Build CppNew (Darwin) | ||
| run: | | ||
| sh Examples/CppNew/GenerateMake.sh | ||
| cd Examples/CppNew/build | ||
| cmake --build . | ||
| ./Example_ExtractInfo ../../Files/Helix.3mf | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,3 +5,5 @@ Include/Model/COM/NMR_COMVersion.h | |
| debug | ||
| .DS_Store | ||
| .vscode | ||
| .idea | ||
| cmake-build-* | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Change the version to 2.3.1