-
Notifications
You must be signed in to change notification settings - Fork 3.5k
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
Update libosmium to 2.18.0. Fix problem with Docker image build. #6303
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -47,6 +47,17 @@ jobs: | |
./scripts/format.sh && ./scripts/error_on_dirty.sh | ||
node ./scripts/validate_changelog.js | ||
npm run docs && ./scripts/error_on_dirty.sh | ||
|
||
docker-image: | ||
needs: format-taginfo-docs | ||
runs-on: ubuntu-22.04 | ||
continue-on-error: false | ||
steps: | ||
- name: Check out the repo | ||
uses: actions/checkout@v3 | ||
- name: Docker build | ||
run: | | ||
docker build -f docker/Dockerfile . | ||
|
||
build-test-publish: | ||
needs: format-taginfo-docs | ||
|
@@ -78,13 +89,13 @@ jobs: | |
OSRM_CONNECTION_RETRIES: 10 | ||
OSRM_CONNECTION_EXP_BACKOFF_COEF: 1.5 | ||
|
||
- name: clang-5.0-debug | ||
- name: clang-6.0-debug | ||
continue-on-error: false | ||
node: 12 | ||
runs-on: ubuntu-20.04 | ||
BUILD_TOOLS: ON | ||
BUILD_TYPE: Debug | ||
CLANG_VERSION: 5.0.0 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Had build errors on 5.0, I think it is okay to update it to 6.0. |
||
CLANG_VERSION: 6.0.0 | ||
CUCUMBER_TIMEOUT: 60000 | ||
|
||
- name: clang-11.0-debug-clang-tidy | ||
|
@@ -113,7 +124,7 @@ jobs: | |
runs-on: ubuntu-20.04 | ||
BUILD_TOOLS: ON | ||
BUILD_TYPE: Release | ||
CLANG_VERSION: 5.0.0 | ||
CLANG_VERSION: 6.0.0 | ||
ENABLE_CONAN: ON | ||
|
||
- name: gcc-11-release | ||
|
@@ -230,7 +241,7 @@ jobs: | |
node: 12 | ||
runs-on: ubuntu-20.04 | ||
BUILD_TYPE: Release | ||
CLANG_VERSION: 5.0.0 | ||
CLANG_VERSION: 6.0.0 | ||
ENABLE_GLIBC_WORKAROUND: ON | ||
ENABLE_CONAN: ON | ||
NODE_PACKAGE_TESTS_ONLY: ON | ||
|
@@ -241,7 +252,7 @@ jobs: | |
node: 12 | ||
runs-on: ubuntu-20.04 | ||
BUILD_TYPE: Debug | ||
CLANG_VERSION: 5.0.0 | ||
CLANG_VERSION: 6.0.0 | ||
ENABLE_GLIBC_WORKAROUND: ON | ||
ENABLE_CONAN: ON | ||
NODE_PACKAGE_TESTS_ONLY: ON | ||
|
@@ -252,7 +263,7 @@ jobs: | |
node: 14 | ||
runs-on: ubuntu-20.04 | ||
BUILD_TYPE: Release | ||
CLANG_VERSION: 5.0.0 | ||
CLANG_VERSION: 6.0.0 | ||
ENABLE_GLIBC_WORKAROUND: ON | ||
ENABLE_CONAN: ON | ||
NODE_PACKAGE_TESTS_ONLY: ON | ||
|
@@ -263,7 +274,7 @@ jobs: | |
node: 14 | ||
runs-on: ubuntu-20.04 | ||
BUILD_TYPE: Debug | ||
CLANG_VERSION: 5.0.0 | ||
CLANG_VERSION: 6.0.0 | ||
ENABLE_GLIBC_WORKAROUND: ON | ||
ENABLE_CONAN: ON | ||
NODE_PACKAGE_TESTS_ONLY: ON | ||
|
@@ -275,7 +286,7 @@ jobs: | |
node: 16 | ||
runs-on: ubuntu-20.04 | ||
BUILD_TYPE: Release | ||
CLANG_VERSION: 5.0.0 | ||
CLANG_VERSION: 6.0.0 | ||
ENABLE_GLIBC_WORKAROUND: ON | ||
ENABLE_CONAN: ON | ||
NODE_PACKAGE_TESTS_ONLY: ON | ||
|
@@ -286,7 +297,7 @@ jobs: | |
node: 16 | ||
runs-on: ubuntu-20.04 | ||
BUILD_TYPE: Debug | ||
CLANG_VERSION: 5.0.0 | ||
CLANG_VERSION: 6.0.0 | ||
ENABLE_GLIBC_WORKAROUND: ON | ||
ENABLE_CONAN: ON | ||
NODE_PACKAGE_TESTS_ONLY: ON | ||
|
@@ -311,7 +322,7 @@ jobs: | |
node: 16 | ||
runs-on: ubuntu-20.04 | ||
BUILD_TYPE: Release | ||
CLANG_VERSION: 5.0.0 | ||
CLANG_VERSION: 6.0.0 | ||
ENABLE_GLIBC_WORKAROUND: ON | ||
ENABLE_CONAN: ON | ||
NODE_PACKAGE_TESTS_ONLY: ON | ||
|
@@ -323,7 +334,7 @@ jobs: | |
node: 16 | ||
runs-on: ubuntu-20.04 | ||
BUILD_TYPE: Debug | ||
CLANG_VERSION: 5.0.0 | ||
CLANG_VERSION: 6.0.0 | ||
ENABLE_GLIBC_WORKAROUND: ON | ||
ENABLE_CONAN: ON | ||
NODE_PACKAGE_TESTS_ONLY: ON | ||
|
@@ -346,7 +357,7 @@ jobs: | |
node: "lts/*" | ||
runs-on: ubuntu-20.04 | ||
BUILD_TYPE: Release | ||
CLANG_VERSION: 5.0.0 | ||
CLANG_VERSION: 6.0.0 | ||
ENABLE_GLIBC_WORKAROUND: ON | ||
ENABLE_CONAN: ON | ||
NODE_PACKAGE_TESTS_ONLY: ON | ||
|
@@ -357,7 +368,7 @@ jobs: | |
node: "lts/*" | ||
runs-on: ubuntu-20.04 | ||
BUILD_TYPE: Debug | ||
CLANG_VERSION: 5.0.0 | ||
CLANG_VERSION: 6.0.0 | ||
ENABLE_GLIBC_WORKAROUND: ON | ||
ENABLE_CONAN: ON | ||
NODE_PACKAGE_TESTS_ONLY: ON | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
custom: "https://osmcode.org/sponsors.html" |
48 changes: 48 additions & 0 deletions
48
third_party/libosmium/.github/ISSUE_TEMPLATE/bug-report.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
--- | ||
name: Report problems with the software | ||
about: You found a (possible) bug in libosmium | ||
title: '' | ||
labels: '' | ||
assignees: '' | ||
|
||
--- | ||
|
||
## What version of libosmium are you using? | ||
|
||
<!-- Please use the [latest | ||
release](https://github.com/osmcode/libosmium/releases) or master if at all | ||
possible. --> | ||
|
||
|
||
## What operating system and compiler are you using? | ||
|
||
<!-- Also what Linux distribution if applicable, OS version? --> | ||
|
||
|
||
## Tell us something about your system | ||
|
||
<!-- How much RAM do you have, how many CPUs, bare metal or cloud setup? --> | ||
|
||
|
||
## What did you do exactly? | ||
|
||
<!-- Please provide the command(s) you used including all options etc. Include | ||
links to input files. --> | ||
|
||
|
||
## What did you expect to happen? | ||
|
||
<!-- Describe in detail what you expected the above would do. --> | ||
|
||
|
||
## What did happen instead? | ||
|
||
<!-- Please describe what happened and why you think this is wrong. Please | ||
include (or link to, if it is too verbose) the log output. --> | ||
|
||
|
||
## What did you do to try analyzing the problem? | ||
|
||
<!-- Describe what steps you already did to try analyzing the problem before | ||
reporting. --> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
contact_links: | ||
- name: help.osm.org | ||
url: https://help.openstreetmap.org/ | ||
about: Ask questions and get support from the community. |
10 changes: 10 additions & 0 deletions
10
third_party/libosmium/.github/actions/build-windows/action.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
name: Windows Build | ||
|
||
runs: | ||
using: composite | ||
steps: | ||
- name: Build | ||
run: cmake --build . --config Release --verbose | ||
shell: bash | ||
working-directory: build | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
name: Build | ||
|
||
runs: | ||
using: composite | ||
steps: | ||
- name: Build | ||
run: make VERBOSE=1 | ||
shell: bash | ||
working-directory: build | ||
|
13 changes: 13 additions & 0 deletions
13
third_party/libosmium/.github/actions/cmake-windows/action.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
name: Windows CMake | ||
|
||
runs: | ||
using: composite | ||
steps: | ||
- name: Create build directory | ||
run: mkdir build | ||
shell: bash | ||
- name: Configure | ||
run: cmake -LA .. -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DBUILD_HEADERS=OFF -DBUILD_BENCHMARKS=ON -DOsmium_DEBUG=TRUE -DPROTOZERO_INCLUDE_DIR=${GITHUB_WORKSPACE}/../protozero/include | ||
shell: bash | ||
working-directory: build | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
name: CMake | ||
|
||
runs: | ||
using: composite | ||
steps: | ||
- name: Create build directory | ||
run: mkdir build | ||
shell: bash | ||
- name: Configure | ||
run: | | ||
cmake -LA .. \ | ||
-DBUILD_DATA_TESTS=ON \ | ||
-DUSE_CPP_VERSION=${CPP_VERSION} \ | ||
-DWITH_PROJ=${WITH_PROJ} \ | ||
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ | ||
-DPROTOZERO_INCLUDE_DIR=${GITHUB_WORKSPACE}/../protozero/include | ||
shell: bash | ||
working-directory: build | ||
|
10 changes: 10 additions & 0 deletions
10
third_party/libosmium/.github/actions/ctest-windows/action.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
name: Windows Test | ||
|
||
runs: | ||
using: composite | ||
steps: | ||
- name: Test | ||
run: ctest --output-on-failure -C Release | ||
shell: bash | ||
working-directory: build | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
name: ctest | ||
|
||
runs: | ||
using: composite | ||
steps: | ||
- name: Test | ||
run: ctest --output-on-failure | ||
shell: bash | ||
working-directory: build | ||
|
13 changes: 13 additions & 0 deletions
13
third_party/libosmium/.github/actions/install-macos/action.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
name: Install homebrew packages on macOS | ||
|
||
runs: | ||
using: composite | ||
steps: | ||
- name: Install packages | ||
run: | | ||
brew install \ | ||
boost \ | ||
gdal \ | ||
google-sparsehash | ||
shell: bash | ||
|
9 changes: 9 additions & 0 deletions
9
third_party/libosmium/.github/actions/install-protozero/action.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
name: Install Protozero from git | ||
|
||
runs: | ||
using: composite | ||
steps: | ||
- name: Install from git | ||
run: git clone --quiet --depth 1 https://github.com/mapbox/protozero.git ../protozero | ||
shell: bash | ||
|
23 changes: 23 additions & 0 deletions
23
third_party/libosmium/.github/actions/install-ubuntu/action.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
name: Install apt packages on Ubuntu/Debian | ||
|
||
runs: | ||
using: composite | ||
steps: | ||
- name: Install packages | ||
run: | | ||
sudo apt-get update -q | ||
sudo apt-get install -yq \ | ||
doxygen \ | ||
libboost-dev \ | ||
libgdal-dev \ | ||
libgeos++-dev \ | ||
liblz4-dev \ | ||
libproj-dev \ | ||
libsparsehash-dev \ | ||
ruby-json \ | ||
spatialite-bin | ||
test "$CC" = clang-6.0 && sudo apt-get install -yq --no-install-suggests --no-install-recommends clang-6.0 | ||
test "$CC" = clang-8 && sudo apt-get install -yq --no-install-suggests --no-install-recommends clang-8 | ||
test "$CC" = clang-13 && sudo apt-get install -yq --no-install-suggests --no-install-recommends clang-13 | ||
shell: bash | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Checks that we won’t have problem like this again
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's add
continue-on-error: false
to this job in that case.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.