[CI] xenial 1.2->1.3

This commit is contained in:
Maxim Kulyk 2020-05-11 14:48:37 +03:00 committed by Ivan
parent dd5c54290c
commit d67e77899f
2 changed files with 6 additions and 6 deletions

View File

@ -10,8 +10,8 @@ jobs:
services: docker
cache: ccache
compiler: gcc
install: "docker pull rpcs3/rpcs3-travis-xenial:1.2"
script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .ci/travis.env rpcs3/rpcs3-travis-xenial:1.2 /rpcs3/.ci/build-linux.sh'
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'
- os: linux
dist: xenial
env:
@ -20,8 +20,8 @@ jobs:
services: docker
cache: ccache
compiler: clang
install: "docker pull rpcs3/rpcs3-travis-xenial:1.2"
script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .ci/travis.env rpcs3/rpcs3-travis-xenial:1.2 /rpcs3/.ci/build-linux.sh'
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'
# - os: osx
# osx_image: xcode11.3
# addons:

View File

@ -31,13 +31,13 @@ jobs:
displayName: ccache
- bash: |
docker pull --quiet rpcs3/rpcs3-travis-xenial:1.2
docker pull --quiet rpcs3/rpcs3-travis-xenial:1.3
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.2 \
rpcs3/rpcs3-travis-xenial:1.3 \
/rpcs3/.ci/build-linux.sh
displayName: Docker setup and build