From d67e77899f92a95c1970d454d2b247ed50a6e4e8 Mon Sep 17 00:00:00 2001 From: Maxim Kulyk Date: Mon, 11 May 2020 14:48:37 +0300 Subject: [PATCH] [CI] xenial 1.2->1.3 --- .travis.yml | 8 ++++---- azure-pipelines.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index b44771be1a..63d6115074 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.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: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4ce1b5958d..f93b18c169 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.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