diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-01-25 11:59:04 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-01-25 11:59:04 +0100 |
| commit | 7d4d3431491910ac9918a3cd0ce532c247e052ce (patch) | |
| tree | 7dbf7d833d9bff0f60fe5d2666b77aa507feddc9 | |
| parent | 1147066728bcd2ad46ef379b49ae408756f420a5 (diff) | |
| download | ATCD-7d4d3431491910ac9918a3cd0ce532c247e052ce.tar.gz | |
Don't force c++11 through the github action, that should be the default
* .github/workflows/macosx.yml:
| -rw-r--r-- | .github/workflows/macosx.yml | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/.github/workflows/macosx.yml b/.github/workflows/macosx.yml index c6420a4b2a0..014bece5fdd 100644 --- a/.github/workflows/macosx.yml +++ b/.github/workflows/macosx.yml @@ -10,12 +10,11 @@ jobs: build: strategy: matrix: - cxxstd: ["11"] os: [macos-10.15, macos-11.0] include: - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU runs-on: ${{ matrix.os }} - name: "${{ matrix.os }}-C++${{ matrix.cxxstd }}" + name: "${{ matrix.os }}-C++" env: ACE_ROOT: ${{ github.workspace }}/ACE TAO_ROOT: ${{ github.workspace }}/TAO @@ -32,13 +31,9 @@ jobs: run: | '#include "ace/config-macosx.h"' > ${env:ACE_ROOT}/ace/config.h shell: pwsh - - name: Add c++${{ matrix.cxxstd }} platform_macros.GNU - run: | - 'c++${{ matrix.cxxstd }}=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: | |