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

chore: Update Devcontainer to 24.04 #10

Merged
merged 4 commits into from
Jun 25, 2024
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
6 changes: 3 additions & 3 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/devcontainers/cpp:jammy
FROM mcr.microsoft.com/devcontainers/cpp:noble

SHELL ["/bin/bash", "-o", "pipefail", "-c"]

Expand Down Expand Up @@ -35,8 +35,8 @@ RUN apt-get update && apt-get upgrade --yes && \
gdb \
locales \
clang-format \
gcc-12 \
g++-12 && \
gcc-13 \
g++-13 && \
\
# cleanup
apt-get autoremove --purge -y && \
Expand Down
1 change: 1 addition & 0 deletions .devcontainer/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"dependencies": [
"boost-log",
"boost-program-options",
"boost-filesystem",
"icu",
"boost-timer",
"shapelib",
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ jobs:
# Change this to be your CI task/script
runCmd: |
# Add multiple commands to run if needed
export CC=gcc-12
export CXX=g++-12
export CC=gcc-13
export CXX=g++-13
mkdir -p build
cd build
cmake -G'Ninja' -DVCPKG_INSTALLED_DIR=/vcpkg_installed -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake ..
Expand Down
4 changes: 2 additions & 2 deletions plugins/navteq/navteq_plugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
*/

#include <boost/algorithm/string/join.hpp>
#include <boost/filesystem/operations.hpp>
#include <boost/filesystem/path.hpp>
#include <boost/filesystem.hpp>
#include <boost/log/trivial.hpp>
#include <boost/range/algorithm/copy.hpp>
#include <boost/range/iterator_range.hpp>
#include <exception>
#include <iomanip>
#include <ogr_api.h>
Expand Down
Loading