mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-07-03 13:31:27 +12:00
Bump gcc to 11, shellcheck and SDL2 (#10324)
This commit is contained in:
parent
160b131de3
commit
18627960d7
3 changed files with 4 additions and 4 deletions
|
@ -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
|
# 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.
|
# for which definitions correlate to which CXXABI version.
|
||||||
# Currently we target a minimum of GLIBCXX_3.4.26 and CXXABI_1.3.11
|
# Currently we target a minimum of GLIBCXX_3.4.26 and CXXABI_1.3.11
|
||||||
printf "#include <bits/stdc++.h>\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 <exception>\n#include <memory_resource>\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
|
# Package it up and send it off
|
||||||
./squashfs-root/usr/bin/appimagetool "$APPDIR"
|
./squashfs-root/usr/bin/appimagetool "$APPDIR"
|
||||||
|
|
|
@ -60,7 +60,7 @@ windows_task:
|
||||||
|
|
||||||
linux_task:
|
linux_task:
|
||||||
container:
|
container:
|
||||||
image: rpcs3/rpcs3-ci-bionic:1.0
|
image: rpcs3/rpcs3-ci-bionic:1.1
|
||||||
cpu: 4
|
cpu: 4
|
||||||
memory: 16G
|
memory: 16G
|
||||||
env:
|
env:
|
||||||
|
|
|
@ -35,13 +35,13 @@ jobs:
|
||||||
displayName: ccache
|
displayName: ccache
|
||||||
|
|
||||||
- bash: |
|
- bash: |
|
||||||
docker pull --quiet rpcs3/rpcs3-ci-bionic:1.0
|
docker pull --quiet rpcs3/rpcs3-ci-bionic:1.1
|
||||||
docker run \
|
docker run \
|
||||||
-v $(pwd):/rpcs3 \
|
-v $(pwd):/rpcs3 \
|
||||||
--env-file .ci/docker.env \
|
--env-file .ci/docker.env \
|
||||||
-v $CCACHE_DIR:/root/.ccache \
|
-v $CCACHE_DIR:/root/.ccache \
|
||||||
-v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \
|
-v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \
|
||||||
rpcs3/rpcs3-ci-bionic:1.0 \
|
rpcs3/rpcs3-ci-bionic:1.1 \
|
||||||
/rpcs3/.ci/build-linux.sh
|
/rpcs3/.ci/build-linux.sh
|
||||||
displayName: Docker setup and build
|
displayName: Docker setup and build
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue