Skip to content

Commit

Permalink
Merge branch 'main' into gh-pages
Browse files Browse the repository at this point in the history
  • Loading branch information
AnatolyKalin committed Dec 12, 2024
2 parents 3866d1d + d3aeae3 commit 370d31f
Show file tree
Hide file tree
Showing 468 changed files with 115,059 additions and 5,818 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
xcode: '15.0'
cc: 'clang'
cxx: 'clang++'
buildType: [ Release, Debug ]
buildType: [ Release, Debug, RelWithDebInfo ]

name: "${{ matrix.config.name }}-${{matrix.buildType}}"
runs-on: ${{ matrix.config.image }}
Expand All @@ -87,6 +87,7 @@ jobs:
-DCMAKE_C_COMPILER=${{matrix.config.cc}}
-DCMAKE_CXX_COMPILER=${{matrix.config.cxx}}
-DDXFCXX_BUILD_DOC=OFF
-DDXFCXX_FEATURE_STACKTRACE=ON
- name: Configure CMake
if: ${{ contains(matrix.config.os, 'linux') }}
Expand All @@ -96,13 +97,15 @@ jobs:
-DCMAKE_C_COMPILER=${{matrix.config.cc}}
-DCMAKE_CXX_COMPILER=${{matrix.config.cxx}}
-DDXFCXX_BUILD_DOC=OFF
-DDXFCXX_FEATURE_STACKTRACE=ON
- name: Configure CMake
if: ${{ contains(matrix.config.os, 'win') }}
run: >
cmake -B ${{github.workspace}}/build
-DCMAKE_BUILD_TYPE=${{matrix.buildType}}
-DDXFCXX_BUILD_DOC=OFF
-DDXFCXX_FEATURE_STACKTRACE=ON
- name: Build
if: ${{ !contains(matrix.config.os, 'win') }}
Expand Down
45 changes: 44 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ jobs:
-DDXFCXX_INSTALL_SAMPLES=OFF
-DDXFCXX_INSTALL_TOOLS=OFF
-DDXFCXX_BUILD_DOC=OFF
-DDXFCXX_FEATURE_STACKTRACE=ON
- name: Configure CMake [Samples][Tools]
if: ${{ contains(matrix.config.os, 'windows') && !contains(matrix.buildType, 'Deb') }}
Expand All @@ -129,6 +130,7 @@ jobs:
-DDXFCXX_INSTALL_LIB=OFF
-DDXFCXX_INSTALL_TOOLS=OFF
-DDXFCXX_BUILD_DOC=OFF
-DDXFCXX_FEATURE_STACKTRACE=ON
cmake -B ${{github.workspace}}/build-Tools
-DCMAKE_BUILD_TYPE=${{matrix.buildType}}
Expand All @@ -139,6 +141,7 @@ jobs:
-DDXFCXX_INSTALL_LIB=OFF
-DDXFCXX_INSTALL_SAMPLES=OFF
-DDXFCXX_BUILD_DOC=OFF
-DDXFCXX_FEATURE_STACKTRACE=ON
- name: Configure CMake [Lib]
if: ${{ contains(matrix.config.os, 'macos') }}
Expand All @@ -155,6 +158,7 @@ jobs:
-DDXFCXX_INSTALL_SAMPLES=OFF
-DDXFCXX_INSTALL_TOOLS=OFF
-DDXFCXX_BUILD_DOC=OFF
-DDXFCXX_FEATURE_STACKTRACE=ON
- name: Configure CMake [Samples][Tools]
if: ${{ contains(matrix.config.os, 'macos') && !contains(matrix.buildType, 'Deb') }}
Expand All @@ -170,6 +174,7 @@ jobs:
-DDXFCXX_INSTALL_LIB=OFF
-DDXFCXX_INSTALL_TOOLS=OFF
-DDXFCXX_BUILD_DOC=OFF
-DDXFCXX_FEATURE_STACKTRACE=ON
cmake -B ${{github.workspace}}/build-Tools
-DCMAKE_BUILD_TYPE=${{matrix.buildType}}
Expand All @@ -182,6 +187,7 @@ jobs:
-DDXFCXX_INSTALL_LIB=OFF
-DDXFCXX_INSTALL_SAMPLES=OFF
-DDXFCXX_BUILD_DOC=OFF
-DDXFCXX_FEATURE_STACKTRACE=ON
- name: Configure CMake [Lib]
if: ${{ contains(matrix.config.os, 'linux') }}
Expand All @@ -198,6 +204,7 @@ jobs:
-DDXFCXX_INSTALL_SAMPLES=OFF
-DDXFCXX_INSTALL_TOOLS=OFF
-DDXFCXX_BUILD_DOC=OFF
-DDXFCXX_FEATURE_STACKTRACE=ON
- name: Configure CMake [Samples][Tools]
if: ${{ contains(matrix.config.os, 'linux') && !contains(matrix.buildType, 'Deb') }}
Expand All @@ -213,6 +220,7 @@ jobs:
-DDXFCXX_INSTALL_LIB=OFF
-DDXFCXX_INSTALL_TOOLS=OFF
-DDXFCXX_BUILD_DOC=OFF
-DDXFCXX_FEATURE_STACKTRACE=ON
cmake -B ${{github.workspace}}/build-Tools
-DCMAKE_BUILD_TYPE=${{matrix.buildType}}
Expand All @@ -225,6 +233,7 @@ jobs:
-DDXFCXX_INSTALL_LIB=OFF
-DDXFCXX_INSTALL_SAMPLES=OFF
-DDXFCXX_BUILD_DOC=OFF
-DDXFCXX_FEATURE_STACKTRACE=ON
- name: Build [Lib]
if: ${{ !contains(matrix.config.os, 'win') }}
Expand Down Expand Up @@ -290,11 +299,44 @@ jobs:
build-Samples/*.zip
build-Tools/*.zip
build_full_src_bundle_and_upload:
name: "${{ matrix.config.name }}: Build Full Source Bundle & Upload"
needs: [ get_version ]
strategy:
matrix:
config:
- name: win-vs2022
image: windows-latest
os: windows
cores: 4
cc: 'cl'
cxx: 'cl'
runs-on: ${{ matrix.config.image }}
steps:
- uses: actions/checkout@v4

- name: Prepare build [Full Source Bundle]
run: |
ls
mkdir ${{github.workspace}}/build-bundle
- name: Build [Full Source Bundle]
shell: pwsh
run: |
${{github.workspace}}/scripts/make-source-bundle.ps1 ${{needs.get_version.outputs.version}}
- name: Upload [Full Source Bundle]
uses: actions/upload-artifact@v4
with:
name: artifacts-full-source-bundle-${{matrix.config.name}}
path: |
build-bundle/*.zip
publish_release:
if: ${{ inputs.publish || contains(github.event_name, 'push')}}
runs-on: ubuntu-latest
name: Publish Release
needs: [ get_version, build_package_and_upload ]
needs: [ get_version, build_package_and_upload, build_full_src_bundle_and_upload ]
permissions:
contents: write
steps:
Expand All @@ -316,6 +358,7 @@ jobs:
artifacts/*.zip
artifacts/build-Samples/*.zip
artifacts/build-Tools/*.zip
artifacts/build-bundle/*.zip
prerelease: >
${{ contains(needs.get_version.outputs.version, 'alpha')
|| contains(needs.get_version.outputs.version, 'beta')
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,5 @@ dist-*/
CMakeSettings.json
*.patch
.vs/**
.cache/**
/Folder.DotSettings.user
Loading

0 comments on commit 370d31f

Please sign in to comment.