Browse Source

Merge branch 'develop' into feature/pkg-id-type

# Conflicts:
#	azure-pipelines.yml
default_compile_flags
vector-of-bool 5 years ago
parent
commit
b2273b2ffb
3 changed files with 6 additions and 8 deletions
  1. +4
    -4
      azure-pipelines.yml
  2. +1
    -1
      tests/deps/use-spdlog/gcc.tc.dds
  3. +1
    -3
      tools/gcc-9.dds

+ 4
- 4
azure-pipelines.yml View File

@@ -24,10 +24,10 @@ jobs:
- script: |
set -eu
sudo apt update -y
sudo apt install -y python3-minimal g++-8 ccache
sudo apt install -y python3-minimal g++-9 ccache
python3 -m pip install pytest pytest-xdist
displayName: Prepare System
- script: python3 -u tools/ci.py -B download --cxx g++-8 -T tools/gcc-9.dds
- script: python3 -u tools/ci.py -B download -T tools/gcc-9.dds
displayName: Full CI
- publish: _build/dds
artifact: DDS Executable - Linux
@@ -36,12 +36,12 @@ jobs:
pool:
vmImage: macOS-10.14
steps:
- script: brew install gcc@8 ccache
- script: brew install gcc@8 gcc@9 ccache
displayName: Prepare System
- script: |
set -eu
python3 -m pip install pytest pytest-xdist
python3 -u tools/ci.py -B download --cxx g++-8 -T tools/gcc-9.dds
python3 -u tools/ci.py -B download -T tools/gcc-9.dds
displayName: Build and Run Unit Tests
- publish: _build/dds
artifact: DDS Executable - macOS

+ 1
- 1
tests/deps/use-spdlog/gcc.tc.dds View File

@@ -1,4 +1,4 @@
Compiler-ID: GNU
C++-Version: C++17
C++-Compiler: g++-8
C++-Compiler: g++-9
Flags: -D SPDLOG_COMPILED_LIB

+ 1
- 3
tools/gcc-9.dds View File

@@ -3,8 +3,6 @@ C++-Version: C++17
C-Compiler: gcc-9
C++-Compiler: g++-9
Flags: -D SPDLOG_COMPILED_LIB -fconcepts -Werror=return-type
# Optimize: True
Link-Flags: -static-libgcc -static-libstdc++
Debug: True
# Link-Flags: -fsanitize=address
Link-Flags: -fuse-ld=lld
Compiler-Launcher: ccache

Loading…
Cancel
Save