From ebe174f375fb53c4584f3e7e7b212d28771afb78 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 9 Jun 2020 16:56:09 +0200 Subject: Simplify matrix * .github/workflows/linux.yml: * TAO/tao/Invocation_Retry_State.cpp: * TAO/tao/Invocation_Retry_State.h: --- .github/workflows/linux.yml | 77 +++++++++++++------------------------- TAO/tao/Invocation_Retry_State.cpp | 1 - TAO/tao/Invocation_Retry_State.h | 2 - 3 files changed, 26 insertions(+), 54 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index c2663c37440..ba711ec5f0f 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -10,96 +10,71 @@ jobs: build: strategy: matrix: - name: [ - GCC48, - GCC6, - GCC7, - GCC8, - GCC9, - GCC10, - CLANG5, - CLANG6, - CLANG7, - CLANG8, - CLANG9, - CLANG10 - ] include: - - name: GCC48 - CC: gcc-4.8 + - CC: gcc-4.8 CXX: g++-4.8 PackageDeps: g++-4.8 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - imagename: ubuntu-16.04 - - name: GCC6 - CC: gcc-6 + os: ubuntu-16.04 + - CC: gcc-6 CXX: g++-6 PackageDeps: g++-6 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - imagename: ubuntu-18.04 - - name: GCC7 - CC: gcc-7 + os: ubuntu-18.04 + - CC: gcc-7 CXX: g++-7 PackageDeps: g++-7 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - imagename: ubuntu-18.04 - - name: GCC8 - CC: gcc-8 + os: ubuntu-18.04 + - CC: gcc-8 CXX: g++-8 PackageDeps: g++-8 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - imagename: ubuntu-18.04 - - name: GCC9 - CC: gcc-9 + os: ubuntu-18.04 + - CC: gcc-9 CXX: g++-9 PackageDeps: g++-9 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - imagename: ubuntu-18.04 - - name: GCC10 - CC: gcc-10 + os: ubuntu-18.04 + - CC: gcc-10 CXX: g++-10 PackageDeps: g++-10 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - imagename: ubuntu-20.04 - - name: CLANG5 - CC: clang-5.0 + os: ubuntu-20.04 + - CC: clang-5.0 CXX: clang++-5.0 PackageDeps: clang-5.0 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU - imagename: ubuntu-16.04 - - name: CLANG6 - CC: clang-6.0 + os: ubuntu-16.04 + - CC: clang-6.0 CXX: clang++-6.0 PackageDeps: clang-6.0 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU - imagename: ubuntu-18.04 - - name: CLANG7 - CC: clang-7 + os: ubuntu-18.04 + - CC: clang-7 CXX: clang++-7 PackageDeps: clang-7 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU - imagename: ubuntu-18.04 - - name: CLANG8 - CC: clang-8 + os: ubuntu-18.04 + - CC: clang-8 CXX: clang++-8 PackageDeps: clang-8 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU - imagename: ubuntu-18.04 - - name: CLANG9 - CC: clang-9 + os: ubuntu-18.04 + - CC: clang-9 CXX: clang++-9 PackageDeps: clang-9 Repo: llvm-toolchain-$(lsb_release -cs)-9 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU - imagename: ubuntu-18.04 - - name: CLANG10 - CC: clang-10 + os: ubuntu-18.04 + - CC: clang-10 CXX: clang++-10 PackageDeps: clang-10 Repo: llvm-toolchain-$(lsb_release -cs)-10 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU - imagename: ubuntu-20.04 - runs-on: ${{ matrix.imagename }} + os: ubuntu-20.04 + runs-on: ${{ matrix.os }} + name: ${{ matrix.os }} ruby-${{ matrix.CXX }} env: ACE_ROOT: ${{ github.workspace }}/ACE TAO_ROOT: ${{ github.workspace }}/TAO diff --git a/TAO/tao/Invocation_Retry_State.cpp b/TAO/tao/Invocation_Retry_State.cpp index 9ca1994e8b7..6e3cd989696 100644 --- a/TAO/tao/Invocation_Retry_State.cpp +++ b/TAO/tao/Invocation_Retry_State.cpp @@ -73,7 +73,6 @@ namespace result); } - } TAO::Invocation_Retry_State::Invocation_Retry_State (TAO_Stub &stub) diff --git a/TAO/tao/Invocation_Retry_State.h b/TAO/tao/Invocation_Retry_State.h index 49ba8dc3db7..1e235d124ca 100644 --- a/TAO/tao/Invocation_Retry_State.h +++ b/TAO/tao/Invocation_Retry_State.h @@ -80,14 +80,12 @@ namespace TAO void sleep () const; private: - typedef ACE_Array_Map Ex_Count_Map; Ex_Count_Map ex_count_map_; int forward_on_reply_closed_count_; Invocation_Retry_Params retry_params_; bool forward_on_exception_limit_used_; }; - } TAO_END_VERSIONED_NAMESPACE_DECL -- cgit v1.2.1 From 153af0ed62f2abb0c73b601a7fbc41923b1b44ff Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 9 Jun 2020 17:12:29 +0200 Subject: Simplified actions setup * .github/workflows/linux.yml: * .github/workflows/macosx.yml: --- .github/workflows/linux.yml | 2 +- .github/workflows/macosx.yml | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index ba711ec5f0f..d1bca0dcc75 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 }} ruby-${{ matrix.CXX }} + name: ${{ matrix.os }} ${{ matrix.CXX }} env: ACE_ROOT: ${{ github.workspace }}/ACE TAO_ROOT: ${{ github.workspace }}/TAO diff --git a/.github/workflows/macosx.yml b/.github/workflows/macosx.yml index 1164edebe9d..71f0fc92009 100644 --- a/.github/workflows/macosx.yml +++ b/.github/workflows/macosx.yml @@ -10,14 +10,11 @@ jobs: build: strategy: matrix: - name: [ - macos1015 - ] include: - - name: macos1015 + - os: macos-10.15 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU - imagename: macos-10.15 - runs-on: ${{ matrix.imagename }} + runs-on: ${{ matrix.os }} + name: ${{ matrix.os }} env: ACE_ROOT: ${{ github.workspace }}/ACE TAO_ROOT: ${{ github.workspace }}/TAO -- cgit v1.2.1