diff --git a/.ci/build-freebsd.sh b/.ci/build-freebsd.sh index df26be4392..a894e6be7e 100755 --- a/.ci/build-freebsd.sh +++ b/.ci/build-freebsd.sh @@ -5,14 +5,6 @@ # shellcheck disable=SC2046 git submodule -q update --init --depth 1 $(awk '/path/ && !/llvm/ { print $3 }' .gitmodules) -# Prefer newer Clang on TravisCI (see also .ci/install-freebsd.sh) -if [ -n "$TRAVIS" ]; then - fetch https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.0/libcxx-11.0.0.src.tar.xz - tar xf libcxx-11.0.0.src.tar.xz - export CC=clang11 CXX=clang++11 - export CXXFLAGS="$CXXFLAGS -nostdinc++ -isystem $PWD/libcxx-11.0.0.src/include" -fi - CONFIGURE_ARGS=" -DWITH_LLVM=OFF -DUSE_PRECOMPILED_HEADERS=OFF diff --git a/.ci/build-linux.sh b/.ci/build-linux.sh index 7b0c92cdd5..2904475405 100755 --- a/.ci/build-linux.sh +++ b/.ci/build-linux.sh @@ -55,11 +55,9 @@ ninja; build_status=$?; cd .. -# If it compiled succesfully let's deploy depending on the build pipeline (Travis, Azure Pipelines). -# Travis only deploys on master, and it publishes to GitHub releases. Azure publishes PRs as artifacts -# only. -{ [ "$IS_AZURE" = "true" ] || - { [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; }; +# If it compiled succesfully let's deploy depending on the build pipeline (Azure Pipelines). +# Azure publishes PRs as artifacts only. +{ [ "$IS_AZURE" = "true" ]; } && SHOULD_DEPLOY="true" || SHOULD_DEPLOY="false" if [ "$build_status" -eq 0 ] && [ "$SHOULD_DEPLOY" = "true" ]; then diff --git a/.ci/travis.env b/.ci/docker.env similarity index 57% rename from .ci/travis.env rename to .ci/docker.env index 6dad179fbf..b67a8646c3 100644 --- a/.ci/travis.env +++ b/.ci/docker.env @@ -1,7 +1,3 @@ -# Variables set by Travis CI -TRAVIS_PULL_REQUEST -TRAVIS_BRANCH -TRAVIS_COMMIT # Variables set by Azure Pipelines IS_AZURE BUILD_REASON @@ -9,8 +5,8 @@ BUILD_SOURCEVERSION BUILD_ARTIFACTSTAGINGDIRECTORY BUILD_REPOSITORY_NAME BUILD_SOURCEBRANCHNAME -# Variables for Travis build matrix +# Variables for build matrix COMPILER DEPLOY_APPIMAGE -# Private Travis CI variables +# Private variables GITHUB_TOKEN diff --git a/.ci/install-freebsd.sh b/.ci/install-freebsd.sh index b88cb00c58..84c8bdf347 100755 --- a/.ci/install-freebsd.sh +++ b/.ci/install-freebsd.sh @@ -8,11 +8,6 @@ sed -i '' 's/quarterly/latest/' /etc/pkg/FreeBSD.conf export ASSUME_ALWAYS_YES=true pkg info # debug -# Prefer newer Clang on TravisCI (see also .ci/install-freebsd.sh) -if [ -n "$TRAVIS" ]; then - pkg install llvm11 -fi - # Mandatory dependencies (qt5-dbus and qt5-gui are pulled via qt5-widgets) pkg install git ccache cmake ninja qt5-qmake qt5-buildtools qt5-widgets qt5-concurrent glew openal-soft ffmpeg diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0bcfa25bad..18cf67cf75 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -36,7 +36,7 @@ jobs: docker pull --quiet rpcs3/rpcs3-travis-xenial:1.6 docker run \ -v $(pwd):/rpcs3 \ - --env-file .ci/travis.env \ + --env-file .ci/docker.env \ -v $CCACHE_DIR:/root/.ccache \ -v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \ rpcs3/rpcs3-travis-xenial:1.6 \