Skip to content

Commit

Permalink
Merge pull request #38 from fhoehle/split-outputs
Browse files Browse the repository at this point in the history
Split outputs into library being LGPL and executable being GPL-v3 licensed
  • Loading branch information
ocefpaf authored Dec 11, 2023
2 parents bbd0d4f + a20d178 commit 2463d72
Show file tree
Hide file tree
Showing 24 changed files with 410 additions and 183 deletions.
8 changes: 3 additions & 5 deletions .azure-pipelines/azure-pipelines-linux.yml

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

5 changes: 4 additions & 1 deletion .azure-pipelines/azure-pipelines-osx.yml

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

105 changes: 24 additions & 81 deletions .azure-pipelines/azure-pipelines-win.yml

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

2 changes: 1 addition & 1 deletion .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '10'
- '12'
cdt_name:
- cos6
channel_sources:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BUILD:
c_compiler:
- gcc
c_compiler_version:
- '10'
- '12'
cdt_arch:
- aarch64
cdt_name:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '10'
- '12'
cdt_name:
- cos7
channel_sources:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
c_compiler:
- clang
- clang_bootstrap
c_compiler_version:
- '13'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
c_compiler:
- clang
- clang_bootstrap
c_compiler_version:
- '13'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
c_compiler:
- vs2017
- vs2019
channel_sources:
- conda-forge
channel_targets:
Expand Down
5 changes: 3 additions & 2 deletions .circleci/config.yml

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

29 changes: 22 additions & 7 deletions .scripts/build_steps.sh

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

4 changes: 2 additions & 2 deletions .scripts/logging_utils.sh

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

3 changes: 3 additions & 0 deletions .scripts/run_docker_build.sh

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

28 changes: 19 additions & 9 deletions .scripts/run_osx_build.sh

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

Loading

0 comments on commit 2463d72

Please sign in to comment.