diff --git a/.ci/build-linux.sh b/.ci/build-linux.sh index 855371732d..d5c05c24ab 100755 --- a/.ci/build-linux.sh +++ b/.ci/build-linux.sh @@ -25,8 +25,8 @@ if [ "$COMPILER" = "gcc" ]; then export CXX=${GXX_BINARY} export LINKER=gold # We need to set the following variables for LTO to link properly - export AR=/usr/bin/gcc-ar-9 - export RANLIB=/usr/bin/gcc-ranlib-9 + export AR=/usr/bin/gcc-ar-$GCCVER + export RANLIB=/usr/bin/gcc-ranlib-$GCCVER export CFLAGS="-fuse-linker-plugin" else export CC=${CLANG_BINARY} diff --git a/.travis.yml b/.travis.yml index 63d6115074..216dcf2efd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,8 +10,8 @@ jobs: services: docker cache: ccache compiler: gcc - install: "docker pull rpcs3/rpcs3-travis-xenial:1.3" - script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .ci/travis.env rpcs3/rpcs3-travis-xenial:1.3 /rpcs3/.ci/build-linux.sh' + install: "docker pull rpcs3/rpcs3-travis-xenial:1.4" + script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .ci/travis.env rpcs3/rpcs3-travis-xenial:1.4 /rpcs3/.ci/build-linux.sh' - os: linux dist: xenial env: @@ -20,8 +20,8 @@ jobs: services: docker cache: ccache compiler: clang - install: "docker pull rpcs3/rpcs3-travis-xenial:1.3" - script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .ci/travis.env rpcs3/rpcs3-travis-xenial:1.3 /rpcs3/.ci/build-linux.sh' + install: "docker pull rpcs3/rpcs3-travis-xenial:1.4" + script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .ci/travis.env rpcs3/rpcs3-travis-xenial:1.4 /rpcs3/.ci/build-linux.sh' # - os: osx # osx_image: xcode11.3 # addons: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f93b18c169..bb63601522 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -31,13 +31,13 @@ jobs: displayName: ccache - bash: | - docker pull --quiet rpcs3/rpcs3-travis-xenial:1.3 + docker pull --quiet rpcs3/rpcs3-travis-xenial:1.4 docker run \ -v $(pwd):/rpcs3 \ --env-file .ci/travis.env \ -v $CCACHE_DIR:/root/.ccache \ -v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \ - rpcs3/rpcs3-travis-xenial:1.3 \ + rpcs3/rpcs3-travis-xenial:1.4 \ /rpcs3/.ci/build-linux.sh displayName: Docker setup and build