diff options
| author | Justin Wilson <wilsonj@objectcomputing.com> | 2020-08-13 12:36:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-13 12:36:09 -0500 |
| commit | 7512f22f89870b9b828bf311ab58145c1a8cb5d0 (patch) | |
| tree | 843881dba724cb783c65c00584ec9463294e0efc | |
| parent | 7e1c8bb7b5eb72118ddc03623da85d213328bce6 (diff) | |
| parent | 0e0e54bdcd95385386f81fcb677f2d6718349adf (diff) | |
| download | ATCD-7512f22f89870b9b828bf311ab58145c1a8cb5d0.tar.gz | |
Merge pull request #1 from mitza-oci/pr1179
GitHub Actions updates for #1179
| -rw-r--r-- | .github/workflows/macosx.yml | 10 | ||||
| -rw-r--r-- | ACE/tests/Compiler_Features_32_Test.cpp | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/.github/workflows/macosx.yml b/.github/workflows/macosx.yml index 71f0fc92009..276095b4a18 100644 --- a/.github/workflows/macosx.yml +++ b/.github/workflows/macosx.yml @@ -10,11 +10,12 @@ jobs: build: strategy: matrix: + cxxstd: [3, 11] include: - os: macos-10.15 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU runs-on: ${{ matrix.os }} - name: ${{ matrix.os }} + name: "${{ matrix.os }}-${{ matrix.cxxstd }}" env: ACE_ROOT: ${{ github.workspace }}/ACE TAO_ROOT: ${{ github.workspace }}/TAO @@ -31,9 +32,14 @@ jobs: run: | '#include "ace/config-macosx.h"' > ${env:ACE_ROOT}/ace/config.h shell: pwsh + - name: Add c++11 to platform_macros.GNU + if: matrix.cxxstd == 11 + run: | + 'c++11=1' > ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU + shell: pwsh - name: create $ACE_ROOT/include/makeinclude/platform_macros.GNU run: | - '${{ matrix.platform_file }}' > ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU + '${{ matrix.platform_file }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU shell: pwsh - name: create $ACE_ROOT/bin/MakeProjectCreator/config/default.features run: | diff --git a/ACE/tests/Compiler_Features_32_Test.cpp b/ACE/tests/Compiler_Features_32_Test.cpp index 29590337a2f..186aa99c53d 100644 --- a/ACE/tests/Compiler_Features_32_Test.cpp +++ b/ACE/tests/Compiler_Features_32_Test.cpp @@ -45,7 +45,7 @@ A::u_type_::~u_type_ () void A::clear () { #if defined __clang__ && \ - (defined __apple_build_version__ && __apple_build_version__ <= 11000033 \ + (defined __apple_build_version__ && __apple_build_version__ <= 11030032 \ || __clang_major__ <= 10) #define CLANG_WORKAROUND #endif |