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

[CI] xenial 1.2->1.3

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

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.2" 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.2 /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.3 /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.2" 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.2 /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.3 /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.2 docker pull --quiet rpcs3/rpcs3-travis-xenial:1.3
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.2 \ rpcs3/rpcs3-travis-xenial:1.3 \
/rpcs3/.ci/build-linux.sh /rpcs3/.ci/build-linux.sh
displayName: Docker setup and build displayName: Docker setup and build