archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 21:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Bump Linux CI version (#8226)

Browse source 
This updates Qt to 5.14.2, Ninja to 1.10.0, SDL2 to 2.0.12
This commit is contained in:
Zion 2020-05-14 20:04:24 -07:00 • committed by GitHub
parent 67b002f586
commit b5dbb2eb36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.ci/build-linux.sh
View file

@ -25,8 +25,8 @@ if [ "$COMPILER" = "gcc" ]; then
export CXX=${GXX_BINARY} export CXX=${GXX_BINARY}
export LINKER=gold export LINKER=gold
# We need to set the following variables for LTO to link properly # We need to set the following variables for LTO to link properly
export AR=/usr/bin/gcc-ar-9 export AR=/usr/bin/gcc-ar-$GCCVER
export RANLIB=/usr/bin/gcc-ranlib-9 export RANLIB=/usr/bin/gcc-ranlib-$GCCVER
export CFLAGS="-fuse-linker-plugin" export CFLAGS="-fuse-linker-plugin"
else else
export CC=${CLANG_BINARY} export CC=${CLANG_BINARY}

8
.travis.yml
View file

@ -10,8 +10,8 @@ jobs:
services: docker services: docker
cache: ccache cache: ccache
compiler: gcc compiler: gcc
install: "docker pull rpcs3/rpcs3-travis-xenial:1.3" 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.3 /rpcs3/.ci/build-linux.sh' 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 - os: linux
dist: xenial dist: xenial
env: env:
@ -20,8 +20,8 @@ jobs:
services: docker services: docker
cache: ccache cache: ccache
compiler: clang compiler: clang
install: "docker pull rpcs3/rpcs3-travis-xenial:1.3" 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.3 /rpcs3/.ci/build-linux.sh' 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 # - os: osx
# osx_image: xcode11.3 # osx_image: xcode11.3
# addons: # addons:

4
azure-pipelines.yml
View file

@ -31,13 +31,13 @@ jobs:
displayName: ccache displayName: ccache
- bash: | - bash: |
docker pull --quiet rpcs3/rpcs3-travis-xenial:1.3 docker pull --quiet rpcs3/rpcs3-travis-xenial:1.4
docker run \ docker run \
-v $(pwd):/rpcs3 \ -v $(pwd):/rpcs3 \
--env-file .ci/travis.env \ --env-file .ci/travis.env \
-v $CCACHE_DIR:/root/.ccache \ -v $CCACHE_DIR:/root/.ccache \
-v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \ -v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \
rpcs3/rpcs3-travis-xenial:1.3 \ rpcs3/rpcs3-travis-xenial:1.4 \
/rpcs3/.ci/build-linux.sh /rpcs3/.ci/build-linux.sh
displayName: Docker setup and build displayName: Docker setup and build