Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated bundled protozero to v1.7.0 #5859

Merged
merged 1 commit into from
Oct 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# Unreleased
- Changes from 5.23.0
- Infrastructure
- CHANGED: Bundled protozero updated to v1.7.0. [#5858](https://github.com/Project-OSRM/osrm-backend/pull/5858)

# 5.23.0
- Changes from 5.22.0
Expand Down
27 changes: 26 additions & 1 deletion third_party/protozero/.clang-tidy
Original file line number Diff line number Diff line change
@@ -1,14 +1,33 @@
---
Checks: '*,-cert-dcl21-cpp,-cert-err60-cpp,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-type-reinterpret-cast,-fuchsia-*,-google-runtime-references,-hicpp-no-array-decay'
Checks: '*,-bugprone-signed-char-misuse,-cert-dcl21-cpp,-cert-err58-cpp,-cert-err60-cpp,-cppcoreguidelines-avoid-c-arrays,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-macro-usage,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-type-reinterpret-cast,-fuchsia-*,-google-runtime-references,-hicpp-avoid-c-arrays,-hicpp-no-array-decay,-hicpp-vararg,-modernize-avoid-c-arrays,-modernize-use-trailing-return-type,-readability-implicit-bool-conversion,-readability-magic-numbers'
#
# Disabled checks:
#
# bugprone-signed-char-misuse
# Lots of warnings in varint.hpp otherwise.
#
# cert-dcl21-cpp
# It is unclear whether this is still a good recommendation in modern C++.
#
# cert-err58-cpp
# Due to the Catch2 test framework.
#
# cert-err60-cpp
# Reports std::runtime_error as broken which we can't do anything about.
#
# cppcoreguidelines-avoid-c-arrays
# hicpp-avoid-c-arrays
# modernize-avoid-c-arrays
# Makes sense for some array, but especially for char arrays using
# std::array isn't a good solution.
#
# cppcoreguidelines-avoid-magic-numbers
# readability-magic-numbers
# Good idea, but it goes too far to force this everywhere.
#
# cppcoreguidelines-macro-usage
# There are cases where macros are simply needed.
#
# cppcoreguidelines-pro-bounds-array-to-pointer-decay
# Limited use and many false positives including for all asserts.
#
Expand All @@ -28,6 +47,12 @@ Checks: '*,-cert-dcl21-cpp,-cert-err60-cpp,-cppcoreguidelines-pro-bounds-pointer
# hicpp-no-array-decay
# Limited use and many false positives including for all asserts.
#
# modernize-use-trailing-return-type
# We are not quite that modern.
#
# readability-implicit-bool-conversion
# Not necessarily more readable.
#
WarningsAsErrors: '*'
HeaderFilterRegex: '\/include\/'
AnalyzeTemporaryDtors: false
Expand Down
252 changes: 183 additions & 69 deletions third_party/protozero/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,158 +6,272 @@

language: generic

sudo: false

dist: trusty

#-----------------------------------------------------------------------------

# Save common build configurations as shortcuts, so we can reference them later.
addons_shortcuts:
addons_clang35: &clang35
apt:
sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-3.5' ]
packages: [ 'libprotobuf-dev','protobuf-compiler', 'clang-3.5' ]
packages: [ 'libprotobuf-dev', 'protobuf-compiler', 'clang-3.5' ]
addons_clang38: &clang38
apt:
sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-3.8' ]
packages: [ 'libprotobuf-dev','protobuf-compiler', 'clang-3.8' ]
packages: [ 'libprotobuf-dev', 'protobuf-compiler', 'clang-3.8' ]
addons_clang39: &clang39
apt:
sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-3.9' ]
packages: [ 'libprotobuf-dev','protobuf-compiler', 'clang-3.9' ]
packages: [ 'libprotobuf-dev', 'protobuf-compiler', 'clang-3.9' ]
addons_clang40: &clang40
apt:
sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-4.0' ]
packages: [ 'libprotobuf-dev','protobuf-compiler', 'clang-4.0' ]
sources: [ 'ubuntu-toolchain-r-test' ]
packages: [ 'libprotobuf-dev', 'protobuf-compiler', 'clang-4.0' ]
addons_clang50: &clang50
apt:
sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0' ]
packages: [ 'libprotobuf-dev','protobuf-compiler', 'clang-5.0', 'clang-tidy-5.0' ]
addons_gcc47: &gcc47
sources: [ 'ubuntu-toolchain-r-test' ]
packages: [ 'libprotobuf-dev', 'protobuf-compiler', 'clang-5.0' ]
addons_clang60: &clang60
apt:
sources: [ 'ubuntu-toolchain-r-test' ]
packages: [ 'libprotobuf-dev','protobuf-compiler', 'g++-4.7', 'gcc-4.7' ]
packages: [ 'libprotobuf-dev', 'protobuf-compiler', 'clang-6.0' ]
addons_clang7: &clang7
apt:
packages: [ 'libprotobuf-dev', 'protobuf-compiler', 'clang-7' ]
addons_clang8: &clang8
apt:
packages: [ 'libprotobuf-dev', 'protobuf-compiler', 'clang-8' ]
addons_clang9: &clang9
apt:
packages: [ 'libprotobuf-dev', 'protobuf-compiler', 'clang-9', 'clang-tidy-9' ]
addons_gcc48: &gcc48
apt:
sources: [ 'ubuntu-toolchain-r-test' ]
packages: [ 'libprotobuf-dev','protobuf-compiler', 'g++-4.8', 'gcc-4.8' ]
packages: [ 'libprotobuf-dev', 'protobuf-compiler', 'g++-4.8', 'gcc-4.8' ]
addons_gcc49: &gcc49
apt:
sources: [ 'ubuntu-toolchain-r-test' ]
packages: [ 'libprotobuf-dev','protobuf-compiler', 'g++-4.9', 'gcc-4.9' ]
packages: [ 'libprotobuf-dev', 'protobuf-compiler', 'g++-4.9', 'gcc-4.9' ]
addons_gcc5: &gcc5
apt:
sources: [ 'ubuntu-toolchain-r-test' ]
packages: [ 'libprotobuf-dev','protobuf-compiler', 'g++-5', 'gcc-5' ]
packages: [ 'libprotobuf-dev', 'protobuf-compiler', 'g++-5', 'gcc-5' ]
addons_gcc6: &gcc6
apt:
sources: [ 'ubuntu-toolchain-r-test' ]
packages: [ 'libprotobuf-dev','protobuf-compiler', 'g++-6', 'gcc-6' ]
packages: [ 'libprotobuf-dev', 'protobuf-compiler', 'g++-6', 'gcc-6' ]
addons_gcc7: &gcc7
apt:
packages: [ 'libprotobuf-dev', 'protobuf-compiler' ]
addons_gcc8: &gcc8
apt:
packages: [ 'libprotobuf-dev', 'protobuf-compiler', 'g++-8', 'gcc-8' ]

#-----------------------------------------------------------------------------

matrix:
jobs:
include:
- os: linux
dist: trusty
compiler: "clang-3.5"
env: BUILD='Debug' CC=clang-3.5 CXX=clang++-3.5
env: BUILD=Debug CC=clang-3.5 CXX=clang++-3.5
addons: *clang35

- os: linux
dist: xenial
compiler: "clang-3.8"
env: BUILD='Debug' CC=clang-3.8 CXX=clang++-3.8
env: BUILD=Debug CC=clang-3.8 CXX=clang++-3.8
addons: *clang38

- os: linux
dist: xenial
compiler: "clang-3.9"
env: BUILD='Debug' CC=clang-3.9 CXX=clang++-3.9
env: BUILD=Debug CC=clang-3.9 CXX=clang++-3.9
addons: *clang39

- os: linux
dist: xenial
compiler: "clang-4.0"
env: BUILD='Debug' CC=clang-4.0 CXX=clang++-4.0
env: BUILD=Debug CC=clang-4.0 CXX=clang++-4.0
addons: *clang40

- os: linux
dist: xenial
compiler: "clang-5.0"
env: BUILD='Debug' CC=clang-5.0 CXX=clang++-5.0
CLANG_TIDY=clang-tidy-5.0
env: BUILD=Debug CC=clang-5.0 CXX=clang++-5.0
addons: *clang50

- os: linux
compiler: "clang-5.0"
env: BUILD='Release' CC=clang-5.0 CXX=clang++-5.0
addons: *clang50
dist: xenial
compiler: "clang-6.0"
env: BUILD=Debug CC=clang-6.0 CXX=clang++-6.0
addons: *clang60

- os: linux
compiler: "clang-5.0"
env: BUILD='Debug' CC=clang-5.0 CXX=clang++-5.0
dist: bionic
compiler: "clang-7"
env: BUILD=Debug CC=clang-7 CXX=clang++-7
addons: *clang7

- os: linux
dist: bionic
compiler: "clang-8"
env: BUILD=Debug CC=clang-8 CXX=clang++-8
addons: *clang8

- os: linux
dist: bionic
compiler: "clang-9"
env: BUILD=Debug CC=clang-9 CXX=clang++-9
CLANG_TIDY=clang-tidy-9
addons: *clang9

- os: linux
dist: bionic
compiler: "clang-9"
env: BUILD=Debug CC=clang-9 CXX=clang++-9
CXXFLAGS="-fsanitize=address,undefined,integer -fno-sanitize-recover=all -fno-omit-frame-pointer"
LDFLAGS="-fsanitize=address,undefined,integer"
# LSAN doesn't work on container-based system
sudo: required
addons: *clang50
addons: *clang9

- os: linux
dist: bionic
compiler: "clang-9"
env: BUILD=Release CC=clang-9 CXX=clang++-9
addons: *clang9

- os: linux
compiler: "gcc-4.7"
env: BUILD='Debug' CC=gcc-4.7 CXX=g++-4.7
addons: *gcc47
arch: arm64
dist: bionic
compiler: "clang-9"
env: BUILD=Debug CC=clang-9 CXX=clang++-9
CXXFLAGS="-fsanitize=address,undefined,integer -fno-sanitize-recover=all -fno-omit-frame-pointer"
LDFLAGS="-fsanitize=address,undefined,integer"
addons: *clang9

- os: linux
arch: ppc64le
dist: bionic
compiler: "clang-9"
env: BUILD=Debug CC=clang-9 CXX=clang++-9
CXXFLAGS="-fsanitize=address,undefined,integer -fno-sanitize-recover=all -fno-omit-frame-pointer"
LDFLAGS="-fsanitize=address,undefined,integer"
addons: *clang9

- os: linux
arch: s390x
dist: bionic
compiler: "clang-9"
env: BUILD=Debug CC=clang-9 CXX=clang++-9
CXXFLAGS="-fsanitize=address,undefined,integer -fno-sanitize-recover=all -fno-omit-frame-pointer"
LDFLAGS="-fsanitize=address,undefined,integer"
addons: *clang9

- os: linux
dist: trusty
compiler: "gcc-4.8"
env: BUILD='Debug' CC=gcc-4.8 CXX=g++-4.8
env: BUILD=Debug CC=gcc-4.8 CXX=g++-4.8
addons: *gcc48

- os: linux
dist: trusty
compiler: "gcc-4.9"
env: BUILD='Debug' CC=gcc-4.9 CXX=g++-4.9
COVERAGE=gcov-4.9
CXXFLAGS="--coverage" LDFLAGS="--coverage"
env: BUILD=Debug CC=gcc-4.9 CXX=g++-4.9
addons: *gcc49

- os: linux
dist: trusty
compiler: "gcc-5"
env: BUILD='Debug' CC=gcc-5 CXX=g++-5
env: BUILD=Debug CC=gcc-5 CXX=g++-5
CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=0"
addons: *gcc5

- os: linux
dist: xenial
compiler: "gcc-5"
env: BUILD='Debug' CC=gcc-5 CXX=g++-5
env: BUILD=Debug CC=gcc-5 CXX=g++-5
CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=1"
addons: *gcc5

- os: linux
dist: xenial
compiler: "gcc-6"
env: BUILD='Debug' CC=gcc-6 CXX=g++-6
env: BUILD=Debug CC=gcc-6 CXX=g++-6
addons: *gcc6

- os: linux
compiler: "gcc-6"
env: BUILD='Debug' CC=gcc-6 CXX=g++-6
PROTOZERO_DATA_VIEW=std::experimental::string_view
addons: *gcc6
dist: bionic
compiler: "gcc-7"
env: BUILD=Debug CC=gcc-7 CXX=g++-7
addons: *gcc7

- os: linux
compiler: "gcc-6"
env: BUILD='Release' CC=gcc-6 CXX=g++-6
addons: *gcc6
- os: osx
osx_image: xcode6.4
compiler: clang
env: BUILD='Debug'
dist: bionic
compiler: "gcc-8"
env: BUILD=Debug CC=gcc-8 CXX=g++-8
addons: *gcc8

- os: linux
dist: bionic
compiler: "gcc-8"
env: BUILD=Debug CC=gcc-8 CXX=g++-8
COVERAGE=gcov-8
CXXFLAGS="--coverage" LDFLAGS="--coverage"
addons: *gcc8

- os: linux
dist: bionic
compiler: "gcc-8"
env: BUILD=Debug CC=gcc-8 CXX=g++-8
PROTOZERO_DATA_VIEW=std::string_view
addons: *gcc8

- os: linux
dist: bionic
compiler: "gcc-8"
env: BUILD=Release CC=gcc-8 CXX=g++-8
addons: *gcc8

- os: linux
arch: arm64
dist: bionic
compiler: "gcc-8"
env: BUILD=Debug CC=gcc-8 CXX=g++-8
addons: *gcc8

- os: linux
arch: ppc64le
dist: bionic
compiler: "gcc-8"
env: BUILD=Debug CC=gcc-8 CXX=g++-8
addons: *gcc8

- os: linux
arch: s390x
dist: bionic
compiler: "gcc-8"
env: BUILD=Debug CC=gcc-8 CXX=g++-8
addons: *gcc8

- os: osx
osx_image: xcode7.3
osx_image: xcode9.4
compiler: clang
env: BUILD='Debug'
env: BUILD=Debug

- os: osx
osx_image: xcode8.3
osx_image: xcode10.3
compiler: clang
env: BUILD='Debug'
env: BUILD=Debug

- os: osx
osx_image: xcode9.1
osx_image: xcode11.4
compiler: clang
env: BUILD='Debug'
env: BUILD=Debug

- os: osx
osx_image: xcode9.1
osx_image: xcode11.4
compiler: clang
env: BUILD='Release'
env: BUILD=Release

#-----------------------------------------------------------------------------

install:
- if [[ $(uname -s) == 'Darwin' ]]; then
brew update;
brew install protobuf;
fi

script:
- mkdir build
- cd build
Expand Down
Loading