Remove any mentions of scam CI

This commit is contained in:
Nekotekina 2020-11-24 03:23:01 +03:00
parent 3f028fbb83
commit b55c759f71
5 changed files with 6 additions and 25 deletions

View File

@ -5,14 +5,6 @@
# shellcheck disable=SC2046 # shellcheck disable=SC2046
git submodule -q update --init --depth 1 $(awk '/path/ && !/llvm/ { print $3 }' .gitmodules) 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=" CONFIGURE_ARGS="
-DWITH_LLVM=OFF -DWITH_LLVM=OFF
-DUSE_PRECOMPILED_HEADERS=OFF -DUSE_PRECOMPILED_HEADERS=OFF

View File

@ -55,11 +55,9 @@ ninja; build_status=$?;
cd .. cd ..
# If it compiled succesfully let's deploy depending on the build pipeline (Travis, Azure Pipelines). # If it compiled succesfully let's deploy depending on the build pipeline (Azure Pipelines).
# Travis only deploys on master, and it publishes to GitHub releases. Azure publishes PRs as artifacts # Azure publishes PRs as artifacts only.
# only. { [ "$IS_AZURE" = "true" ];
{ [ "$IS_AZURE" = "true" ] ||
{ [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; };
} && SHOULD_DEPLOY="true" || SHOULD_DEPLOY="false" } && SHOULD_DEPLOY="true" || SHOULD_DEPLOY="false"
if [ "$build_status" -eq 0 ] && [ "$SHOULD_DEPLOY" = "true" ]; then if [ "$build_status" -eq 0 ] && [ "$SHOULD_DEPLOY" = "true" ]; then

View File

@ -1,7 +1,3 @@
# Variables set by Travis CI
TRAVIS_PULL_REQUEST
TRAVIS_BRANCH
TRAVIS_COMMIT
# Variables set by Azure Pipelines # Variables set by Azure Pipelines
IS_AZURE IS_AZURE
BUILD_REASON BUILD_REASON
@ -9,8 +5,8 @@ BUILD_SOURCEVERSION
BUILD_ARTIFACTSTAGINGDIRECTORY BUILD_ARTIFACTSTAGINGDIRECTORY
BUILD_REPOSITORY_NAME BUILD_REPOSITORY_NAME
BUILD_SOURCEBRANCHNAME BUILD_SOURCEBRANCHNAME
# Variables for Travis build matrix # Variables for build matrix
COMPILER COMPILER
DEPLOY_APPIMAGE DEPLOY_APPIMAGE
# Private Travis CI variables # Private variables
GITHUB_TOKEN GITHUB_TOKEN

View File

@ -8,11 +8,6 @@ sed -i '' 's/quarterly/latest/' /etc/pkg/FreeBSD.conf
export ASSUME_ALWAYS_YES=true export ASSUME_ALWAYS_YES=true
pkg info # debug 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) # 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 pkg install git ccache cmake ninja qt5-qmake qt5-buildtools qt5-widgets qt5-concurrent glew openal-soft ffmpeg

View File

@ -36,7 +36,7 @@ jobs:
docker pull --quiet rpcs3/rpcs3-travis-xenial:1.6 docker pull --quiet rpcs3/rpcs3-travis-xenial:1.6
docker run \ docker run \
-v $(pwd):/rpcs3 \ -v $(pwd):/rpcs3 \
--env-file .ci/travis.env \ --env-file .ci/docker.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.6 \ rpcs3/rpcs3-travis-xenial:1.6 \