From 18627960d7d71d1e7212053919fa6a185773688e Mon Sep 17 00:00:00 2001 From: Zion Date: Sat, 22 May 2021 03:36:23 -0700 Subject: [PATCH] Bump gcc to 11, shellcheck and SDL2 (#10324) --- .ci/deploy-linux.sh | 2 +- .cirrus.yml | 2 +- azure-pipelines.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/deploy-linux.sh b/.ci/deploy-linux.sh index 20800dea6b..d6c19a8213 100755 --- a/.ci/deploy-linux.sh +++ b/.ci/deploy-linux.sh @@ -29,7 +29,7 @@ if [ "$DEPLOY_APPIMAGE" = "true" ]; then # See https://github.com/gcc-mirror/gcc/blob/master/libstdc%2B%2B-v3/config/abi/pre/gnu.ver # for which definitions correlate to which CXXABI version. # Currently we target a minimum of GLIBCXX_3.4.26 and CXXABI_1.3.11 - printf "#include \nint main(){std::make_exception_ptr(0);std::pmr::get_default_resource();}" | $CXX -x c++ -std=c++2a -o ./appdir/usr/optional/checker - + printf "#include \n#include \nint main(){std::make_exception_ptr(0);std::pmr::get_default_resource();}" | $CXX -x c++ -std=c++2a -o ./appdir/usr/optional/checker - # Package it up and send it off ./squashfs-root/usr/bin/appimagetool "$APPDIR" diff --git a/.cirrus.yml b/.cirrus.yml index 13ecab73fc..21d77e02b3 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -60,7 +60,7 @@ windows_task: linux_task: container: - image: rpcs3/rpcs3-ci-bionic:1.0 + image: rpcs3/rpcs3-ci-bionic:1.1 cpu: 4 memory: 16G env: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b39316bb8e..382db8c61b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -35,13 +35,13 @@ jobs: displayName: ccache - bash: | - docker pull --quiet rpcs3/rpcs3-ci-bionic:1.0 + docker pull --quiet rpcs3/rpcs3-ci-bionic:1.1 docker run \ -v $(pwd):/rpcs3 \ --env-file .ci/docker.env \ -v $CCACHE_DIR:/root/.ccache \ -v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \ - rpcs3/rpcs3-ci-bionic:1.0 \ + rpcs3/rpcs3-ci-bionic:1.1 \ /rpcs3/.ci/build-linux.sh displayName: Docker setup and build