diff --git a/.travis.yml b/.travis.yml index 5b306cdad..e0584d6b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ env: global: - - CXX=g++-9 CC=gcc-9 + - CXX=g++-13 CC=gcc-13 - secure: gIOAWHsP6BaQgQc/IBEqdcyzMepMQFoKL4BzFwysbTcX3yIT3k5iSHpoCH/+RuHOB8XZl+xOwbOyuV+ujgbb70WB1ycYiQRhYZiX1kdmjodbbqgh9ZbGYajN62sI0JrTin4mGFnTwNJ0g1nuneuqIh0z5bszu+fcbfrqmaYkxO3cKUhyPp1jl7iAFmqkhnnLmXsi0N7d3yn1rLYfEfya9e4LOAC4pKPJUJzrs7vcavRVuFOAL3Lg+DyDsbBHy330SZEERUyX5Jb44nVJ3j9XGrujnPhlwan8wye9vrCrtRhC1lo2cllV9m0oSboJsV9A+bMQ2kgFqjZTMyZyjsQrflYNYhLpiFp3qVCTHpGH7jS6pUOXzRn/T+BUns4/4RJE5EsDzgBOg90oBVNGU++zJjCGMRaOp2LJt7uSCSc8kHEzfgvbcaGI9CPSlZLILVcrifUCNzktbEtQXEJ7SAtsSDI8sbxtBKvL0wExxx8FpKSY4yvRU7xfMhumzU4Ngufz3521MyZkYsOJVE02N/D+jzHRTjGRypatm9QfHeQmRuawT+aZ/Vra9jVTBelFkibshXAiVAm8kkAq4xz9Pml31+nsNUIo9rwfzyPdLAx8qV31EFmf55zggHu0LuEO1mp46y82oPakO6BxVdRtAUnZogagMWflant/KqRlzRsQt/M= notifications: email: diff --git a/Makefile b/Makefile index fae0f8988..3de8b7b3a 100644 --- a/Makefile +++ b/Makefile @@ -3,10 +3,10 @@ # to be set, but for the time being we need to override the defaults so that our existing dev environment works. This # can be removed when that is resolved. ifeq ($(CC),cc) -CC = gcc-9 +CC = gcc-13 endif ifeq ($(CXX),g++) -CXX = g++-9 +CXX = g++-13 endif # Set the optimization level from the environment, or default to -O2. diff --git a/docs/index.md b/docs/index.md index 7771b7a20..3d0e33e49 100644 --- a/docs/index.md +++ b/docs/index.md @@ -40,7 +40,7 @@ You can build from scratch as follows: # Install some dependencies sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo apt-get update - sudo apt-get install build-essential gcc-9 g++-9 libpcre++-dev zlib1g-dev + sudo apt-get install build-essential gcc-13 g++-13 libpcre++-dev zlib1g-dev # Build it cd Bedrock @@ -73,7 +73,7 @@ You can build from scratch as follows: # Install some dependencies with Brew (see: https://brew.sh/) brew update - brew install gcc@6 + brew install gcc@13 # Configure PCRE to use C++17 and compile from source brew uninstall --ignore-dependencies pcre @@ -81,8 +81,8 @@ You can build from scratch as follows: # Add these to the end of the `system "./configure"` command: # "--enable-cpp", # "--enable-pcre64", - # "CXX=/usr/local/bin/g++-9", - # "CXXFLAGS=--std=gnu++14" + # "CXX=/usr/local/bin/g++-13", + # "CXXFLAGS=--std=gnu++17" brew install --build-from-source pcre # Build it diff --git a/test/clustertest/tests/ClusterUpgradeTest.cpp b/test/clustertest/tests/ClusterUpgradeTest.cpp index 8a97bb4e1..80cefc2b4 100644 --- a/test/clustertest/tests/ClusterUpgradeTest.cpp +++ b/test/clustertest/tests/ClusterUpgradeTest.cpp @@ -69,7 +69,7 @@ struct ClusterUpgradeTest : tpunit::TestFixture { ASSERT_FALSE(system(("cd " + brReleaseDir + " && cd Bedrock && git checkout " + bedrockTagName + " > /dev/null").c_str())); // Build the release. - ASSERT_FALSE(system(("cd " + brReleaseDir + " && cd Bedrock && CXX=g++-9 CC=gcc-9 make -j8 > /dev/null").c_str())); + ASSERT_FALSE(system(("cd " + brReleaseDir + " && cd Bedrock && CXX=g++-13 CC=gcc-13 make -j8 > /dev/null").c_str())); // Save the final product. mkdir(prodBedrockDirName.c_str(), 0755); diff --git a/travis.sh b/travis.sh index 09cea67a0..1ea55a8c8 100755 --- a/travis.sh +++ b/travis.sh @@ -1,8 +1,8 @@ #!/bin/bash set -e -export CXX=g++-9 -export CC=gcc-9 +export CXX=g++-13 +export CC=gcc-13 # Add the current working directory to $PATH so that tests can find bedrock. export PATH=$PATH:`pwd` @@ -72,7 +72,7 @@ else fi sudo apt-get update -y -sudo -E apt-get -yq --no-install-suggests --no-install-recommends $(travis_apt_get_options) install gcc-9 g++-9 +sudo -E apt-get -yq --no-install-suggests --no-install-recommends $(travis_apt_get_options) install gcc-13 g++-13 travis_time_finish travis_fold end build_bedrock