diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-08-24 12:42:41 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-08-24 12:42:41 +0200 |
| commit | 41c19f49c615286d74d2e78c19bf5e33fccc03cd (patch) | |
| tree | e78cd4bbdab87e5840fc18352b65b323b471d74e | |
| parent | 026e77fdfb40c5dc60c883266b3fa75974aae90b (diff) | |
| download | ATCD-41c19f49c615286d74d2e78c19bf5e33fccc03cd.tar.gz | |
Migrate several custom travis configurations to travis-ci
* .github/workflows/linux.yml:
* .travis.yml:
| -rw-r--r-- | .github/workflows/linux.yml | 45 | ||||
| -rw-r--r-- | .travis.yml | 4 |
2 files changed, 42 insertions, 7 deletions
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index d1bca0dcc75..b7aed615105 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -73,8 +73,39 @@ jobs: Repo: llvm-toolchain-$(lsb_release -cs)-10 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU os: ubuntu-20.04 + - FEATURE: CORBA/e micro + CC: gcc-10 + CXX: g++-10 + PackageDeps: g++-10 + platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU + os: ubuntu-20.04 + optional_feature: corba_e_micro=1 + optional_macros: corba_e_micro=1 + - FEATURE: CORBA/e compact + CC: gcc-10 + CXX: g++-10 + PackageDeps: g++-10 + platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU + os: ubuntu-20.04 + optional_feature: corba_e_compact=1 + optional_macros: corba_e_compact=1 + - FEATURE: ACE for TAO + CC: gcc-10 + CXX: g++-10 + PackageDeps: g++-10 + platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU + os: ubuntu-20.04 + optional_feature: ace_for_tao=1 + optional_macros: ace_for_tao=1 + - FEATURE: wchar + CC: gcc-10 + CXX: g++-10 + PackageDeps: g++-10 + platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU + os: ubuntu-20.04 + optional_feature: uses_wchar=1 runs-on: ${{ matrix.os }} - name: ${{ matrix.os }} ${{ matrix.CXX }} + name: ${{ matrix.os }} ${{ matrix.CXX }} ${{ matrix.FEATURE }} env: ACE_ROOT: ${{ github.workspace }}/ACE TAO_ROOT: ${{ github.workspace }}/TAO @@ -102,16 +133,24 @@ jobs: run: | '#include "ace/config-linux.h"' > ${env:ACE_ROOT}/ace/config.h shell: pwsh + - name: create optional optional macros + run: | + '${{ matrix.optional_macros }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU + if: matrix.optional_macros != '' - name: create $ACE_ROOT/include/makeinclude/platform_macros.GNU run: | - 'ipv6=1' > ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU + 'ipv6=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU 'xerces3=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU 'ssl=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU '${{ matrix.platform_file }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU shell: pwsh + - name: create optional optional feature + run: | + '${{ matrix.optional_feature }}' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features + if: matrix.optional_feature != '' - name: create $ACE_ROOT/bin/MakeProjectCreator/config/default.features run: | - 'ipv6=1' > ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features + 'ipv6=1' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features 'xerces3=1' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features 'ssl=1' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features 'versioned_namespace=1' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features diff --git a/.travis.yml b/.travis.yml index 536f8d02bcc..4aaf37865f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,10 +9,6 @@ compiler: env: matrix: - - CORBAEMICRO=1 ACEFORTAO=0 TAO=1 - - CORBAECOMPACT=1 ACEFORTAO=0 TAO=1 - - ACEFORTAO=1 TAO=1 - - USES_WCHAR=1 TAO=1 - ACETESTS=1 FACE=1 ACE=1 TAO=0 global: - ACE_ROOT=$TRAVIS_BUILD_DIR/ACE |