From 41c19f49c615286d74d2e78c19bf5e33fccc03cd Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 24 Aug 2020 12:42:41 +0200 Subject: Migrate several custom travis configurations to travis-ci * .github/workflows/linux.yml: * .travis.yml: --- .github/workflows/linux.yml | 45 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) (limited to '.github') 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 -- cgit v1.2.1 From 98e859a7ad36c2f38aa669e82b372ad33772d223 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 24 Aug 2020 12:46:46 +0200 Subject: Attempt to always create files * .github/workflows/linux.yml: --- .github/workflows/linux.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to '.github') diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index b7aed615105..3732d2cb49b 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -135,8 +135,7 @@ jobs: shell: pwsh - name: create optional optional macros run: | - '${{ matrix.optional_macros }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU - if: matrix.optional_macros != '' + '${{ matrix.optional_macros }}' > ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU - name: create $ACE_ROOT/include/makeinclude/platform_macros.GNU run: | 'ipv6=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU @@ -146,8 +145,7 @@ jobs: shell: pwsh - name: create optional optional feature run: | - '${{ matrix.optional_feature }}' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features - if: matrix.optional_feature != '' + '${{ matrix.optional_feature }}' > ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features - name: create $ACE_ROOT/bin/MakeProjectCreator/config/default.features run: | 'ipv6=1' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features -- cgit v1.2.1 From c44151ba0d92b672629e0261540241be373ac44a Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 24 Aug 2020 13:35:59 +0200 Subject: Changed steps * .github/workflows/linux.yml: --- .github/workflows/linux.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to '.github') diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 3732d2cb49b..27ca697d997 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -133,26 +133,31 @@ 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 - name: create $ACE_ROOT/include/makeinclude/platform_macros.GNU + run: | + '${{ matrix.platform_file }}' > ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU + shell: pwsh + - name: extend $ACE_ROOT/include/makeinclude/platform_macros.GNU run: | '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 + - name: add optional optional macros run: | - '${{ matrix.optional_feature }}' > ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features + '${{ matrix.optional_macros }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU + if: matrix.optional_macros != '' - 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 shell: pwsh + - name: add optional optional feature + run: | + '${{ matrix.optional_feature }}' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features + if: matrix.optional_feature != '' - name: Run mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc run: | perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:TAO_ROOT}/TAO_ACE.mwc -workers 4 -- cgit v1.2.1 From 79860e3fa02e7c6f05164eaa4c1d217c3288b35e Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 24 Aug 2020 13:46:04 +0200 Subject: Add missing shell * .github/workflows/linux.yml: --- .github/workflows/linux.yml | 1 + 1 file changed, 1 insertion(+) (limited to '.github') diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 27ca697d997..c6bfe121335 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -146,6 +146,7 @@ jobs: - name: add optional optional macros run: | '${{ matrix.optional_macros }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU + shell: pwsh if: matrix.optional_macros != '' - name: create $ACE_ROOT/bin/MakeProjectCreator/config/default.features run: | -- cgit v1.2.1 From c7c41d0b8e4ab0d126923ece34c1713faf6918ca Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 24 Aug 2020 14:59:28 +0200 Subject: Revert change * .github/workflows/linux.yml: --- .github/workflows/linux.yml | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) (limited to '.github') diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index c6bfe121335..ffd1a3b7fd2 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -73,39 +73,8 @@ 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 }} ${{ matrix.FEATURE }} + name: ${{ matrix.os }} ${{ matrix.CXX }} env: ACE_ROOT: ${{ github.workspace }}/ACE TAO_ROOT: ${{ github.workspace }}/TAO -- cgit v1.2.1 From f6915aae94e5c9dd2418e9e35b9a4c56a8ef4a8b Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 24 Aug 2020 15:01:53 +0200 Subject: Use strange name * .github/workflows/linux.yml: --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index ffd1a3b7fd2..cc6d3bfcbf2 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -74,7 +74,7 @@ jobs: platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU os: ubuntu-20.04 runs-on: ${{ matrix.os }} - name: ${{ matrix.os }} ${{ matrix.CXX }} + name: ${{ matrix.os }} ${{ matrix.CXX }} ${{ matrix.FOO }} env: ACE_ROOT: ${{ github.workspace }}/ACE TAO_ROOT: ${{ github.workspace }}/TAO -- cgit v1.2.1 From b4496900655cbbdfefe21582747bb094957fdfdc Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 24 Aug 2020 15:04:03 +0200 Subject: Add settings back * .github/workflows/linux.yml: --- .github/workflows/linux.yml | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index cc6d3bfcbf2..c6bfe121335 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 }} ${{ matrix.FOO }} + name: ${{ matrix.os }} ${{ matrix.CXX }} ${{ matrix.FEATURE }} env: ACE_ROOT: ${{ github.workspace }}/ACE TAO_ROOT: ${{ github.workspace }}/TAO -- cgit v1.2.1 From aeb90258cf5b706458c7bf2252f5213bf4e2547e Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 24 Aug 2020 15:09:13 +0200 Subject: Feature change * .github/workflows/linux.yml: --- .github/workflows/linux.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to '.github') diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index c6bfe121335..09be9ee9cf1 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -73,7 +73,7 @@ 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 + - feature: CORBAe micro CC: gcc-10 CXX: g++-10 PackageDeps: g++-10 @@ -81,7 +81,7 @@ jobs: os: ubuntu-20.04 optional_feature: corba_e_micro=1 optional_macros: corba_e_micro=1 - - FEATURE: CORBA/e compact + - feature: CORBAe compact CC: gcc-10 CXX: g++-10 PackageDeps: g++-10 @@ -89,7 +89,7 @@ jobs: os: ubuntu-20.04 optional_feature: corba_e_compact=1 optional_macros: corba_e_compact=1 - - FEATURE: ACE for TAO + - feature: ACE for TAO CC: gcc-10 CXX: g++-10 PackageDeps: g++-10 @@ -97,7 +97,7 @@ jobs: os: ubuntu-20.04 optional_feature: ace_for_tao=1 optional_macros: ace_for_tao=1 - - FEATURE: wchar + - feature: wchar CC: gcc-10 CXX: g++-10 PackageDeps: g++-10 @@ -105,7 +105,7 @@ jobs: os: ubuntu-20.04 optional_feature: uses_wchar=1 runs-on: ${{ matrix.os }} - name: ${{ matrix.os }} ${{ matrix.CXX }} ${{ matrix.FEATURE }} + name: ${{ matrix.os }} ${{ matrix.CXX }} ${{ matrix.feature }} env: ACE_ROOT: ${{ github.workspace }}/ACE TAO_ROOT: ${{ github.workspace }}/TAO -- cgit v1.2.1 From 199a95a26ac2efd2844f5217e8eb9dcff4871ea9 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 24 Aug 2020 15:13:05 +0200 Subject: Some to 18.04 as test * .github/workflows/linux.yml: --- .github/workflows/linux.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '.github') diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 09be9ee9cf1..c6da252bc42 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -78,7 +78,7 @@ jobs: CXX: g++-10 PackageDeps: g++-10 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - os: ubuntu-20.04 + os: ubuntu-18.04 optional_feature: corba_e_micro=1 optional_macros: corba_e_micro=1 - feature: CORBAe compact @@ -86,7 +86,7 @@ jobs: CXX: g++-10 PackageDeps: g++-10 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - os: ubuntu-20.04 + os: ubuntu-18.04 optional_feature: corba_e_compact=1 optional_macros: corba_e_compact=1 - feature: ACE for TAO @@ -94,7 +94,7 @@ jobs: CXX: g++-10 PackageDeps: g++-10 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - os: ubuntu-20.04 + os: ubuntu-18.04 optional_feature: ace_for_tao=1 optional_macros: ace_for_tao=1 - feature: wchar -- cgit v1.2.1 From f72009aff2be9f11afeac35acb179ac1627f9c56 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 24 Aug 2020 15:28:34 +0200 Subject: Ubuntu 20.04 has a problem creating a file using powershell * .github/workflows/linux.yml: --- .github/workflows/linux.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '.github') diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index c6da252bc42..bd9ff3c44f4 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -40,7 +40,7 @@ jobs: CXX: g++-10 PackageDeps: g++-10 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - os: ubuntu-20.04 + os: ubuntu-18.04 - CC: clang-5.0 CXX: clang++-5.0 PackageDeps: clang-5.0 @@ -72,7 +72,7 @@ jobs: PackageDeps: clang-10 Repo: llvm-toolchain-$(lsb_release -cs)-10 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU - os: ubuntu-20.04 + os: ubuntu-18.04 - feature: CORBAe micro CC: gcc-10 CXX: g++-10 @@ -102,7 +102,7 @@ jobs: CXX: g++-10 PackageDeps: g++-10 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - os: ubuntu-20.04 + os: ubuntu-18.04 optional_feature: uses_wchar=1 runs-on: ${{ matrix.os }} name: ${{ matrix.os }} ${{ matrix.CXX }} ${{ matrix.feature }} -- cgit v1.2.1 From 964e7dffe328c65a8ef9b23a94fa4e9393916644 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 24 Aug 2020 15:34:35 +0200 Subject: Correct feature names * .github/workflows/linux.yml: --- .github/workflows/linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.github') diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index bd9ff3c44f4..fbbc345f90e 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -73,7 +73,7 @@ jobs: Repo: llvm-toolchain-$(lsb_release -cs)-10 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU os: ubuntu-18.04 - - feature: CORBAe micro + - feature: CORBA/e micro CC: gcc-10 CXX: g++-10 PackageDeps: g++-10 @@ -81,7 +81,7 @@ jobs: os: ubuntu-18.04 optional_feature: corba_e_micro=1 optional_macros: corba_e_micro=1 - - feature: CORBAe compact + - feature: CORBA/e compact CC: gcc-10 CXX: g++-10 PackageDeps: g++-10 -- cgit v1.2.1 From d5145074332d27006217c72ce56d085adef22e94 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 24 Aug 2020 15:36:26 +0200 Subject: Add missing pwsh * .github/workflows/linux.yml: --- .github/workflows/linux.yml | 1 + 1 file changed, 1 insertion(+) (limited to '.github') diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index fbbc345f90e..92fb8f1dea6 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -159,6 +159,7 @@ jobs: run: | '${{ matrix.optional_feature }}' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features if: matrix.optional_feature != '' + shell: pwsh - name: Run mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc run: | perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:TAO_ROOT}/TAO_ACE.mwc -workers 4 -- cgit v1.2.1 From 29eefadab67519914f1808dce5772f2123f967af Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 24 Aug 2020 15:37:32 +0200 Subject: Back to 20.04 * .github/workflows/linux.yml: --- .github/workflows/linux.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '.github') diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 92fb8f1dea6..abe9180dea3 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -72,7 +72,7 @@ jobs: PackageDeps: clang-10 Repo: llvm-toolchain-$(lsb_release -cs)-10 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU - os: ubuntu-18.04 + os: ubuntu-20.04 - feature: CORBA/e micro CC: gcc-10 CXX: g++-10 @@ -94,7 +94,7 @@ jobs: CXX: g++-10 PackageDeps: g++-10 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - os: ubuntu-18.04 + os: ubuntu-20.04 optional_feature: ace_for_tao=1 optional_macros: ace_for_tao=1 - feature: wchar @@ -102,7 +102,7 @@ jobs: CXX: g++-10 PackageDeps: g++-10 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - os: ubuntu-18.04 + os: ubuntu-20.04 optional_feature: uses_wchar=1 runs-on: ${{ matrix.os }} name: ${{ matrix.os }} ${{ matrix.CXX }} ${{ matrix.feature }} -- cgit v1.2.1 From ee941d79516d046f4452017087ec02b1f645957f Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 24 Aug 2020 15:40:41 +0200 Subject: Downgrade to g++9 for wchar * .github/workflows/linux.yml: --- .github/workflows/linux.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to '.github') diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index abe9180dea3..de8c2facc8a 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -98,11 +98,11 @@ jobs: optional_feature: ace_for_tao=1 optional_macros: ace_for_tao=1 - feature: wchar - CC: gcc-10 - CXX: g++-10 - PackageDeps: g++-10 + CC: gcc-9 + CXX: g++-9 + PackageDeps: g++-9 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - os: ubuntu-20.04 + os: ubuntu-18.04 optional_feature: uses_wchar=1 runs-on: ${{ matrix.os }} name: ${{ matrix.os }} ${{ matrix.CXX }} ${{ matrix.feature }} -- cgit v1.2.1 From b347c6e42210ecda743fa13f43294f98f28229ae Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 24 Aug 2020 15:55:16 +0200 Subject: For wchar we need to disable inlining at this moment * .github/workflows/linux.yml: --- .github/workflows/linux.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to '.github') diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index de8c2facc8a..b95fa511838 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -98,12 +98,13 @@ jobs: optional_feature: ace_for_tao=1 optional_macros: ace_for_tao=1 - feature: wchar - CC: gcc-9 - CXX: g++-9 - PackageDeps: g++-9 + CC: gcc-10 + CXX: g++-10 + PackageDeps: g++-10 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - os: ubuntu-18.04 + os: ubuntu-20.04 optional_feature: uses_wchar=1 + optional_macros: inline=0 runs-on: ${{ matrix.os }} name: ${{ matrix.os }} ${{ matrix.CXX }} ${{ matrix.feature }} env: -- cgit v1.2.1 From ffc65a5f47a0815577c1812f214cfde3a3b9070c Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 24 Aug 2020 17:00:05 +0200 Subject: Platform include should be last * .github/workflows/linux.yml: --- .github/workflows/linux.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to '.github') diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index b95fa511838..92c8dae6d36 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -134,13 +134,9 @@ jobs: run: | '#include "ace/config-linux.h"' > ${env:ACE_ROOT}/ace/config.h shell: pwsh - - name: create $ACE_ROOT/include/makeinclude/platform_macros.GNU - run: | - '${{ matrix.platform_file }}' > ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU - shell: pwsh - name: extend $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 shell: pwsh @@ -149,6 +145,10 @@ jobs: '${{ matrix.optional_macros }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU shell: pwsh if: matrix.optional_macros != '' + - name: create $ACE_ROOT/include/makeinclude/platform_macros.GNU + run: | + '${{ matrix.platform_file }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU + shell: pwsh - name: create $ACE_ROOT/bin/MakeProjectCreator/config/default.features run: | 'ipv6=1' > ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features -- cgit v1.2.1 From 37280f99664cf976fbd068376f802ae928af0a7e Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 24 Aug 2020 17:34:20 +0200 Subject: Updated names of steps * .github/workflows/linux.yml: --- .github/workflows/linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.github') diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 92c8dae6d36..fba3cd47194 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -134,7 +134,7 @@ jobs: run: | '#include "ace/config-linux.h"' > ${env:ACE_ROOT}/ace/config.h shell: pwsh - - name: extend $ACE_ROOT/include/makeinclude/platform_macros.GNU + - name: create $ACE_ROOT/include/makeinclude/platform_macros.GNU run: | 'ipv6=1' > ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU 'xerces3=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU @@ -145,7 +145,7 @@ jobs: '${{ matrix.optional_macros }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU shell: pwsh if: matrix.optional_macros != '' - - name: create $ACE_ROOT/include/makeinclude/platform_macros.GNU + - name: extend $ACE_ROOT/include/makeinclude/platform_macros.GNU run: | '${{ matrix.platform_file }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU shell: pwsh -- cgit v1.2.1