YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-17 18:40:02 +00:00
Code Issues Projects Releases Wiki Activity

travis: fix osx archive name, remove unneeded envvars on osx, try to fix windows python

Browse Source
This commit is contained in:
Alibek Omarov 2019-03-29 05:56:11 +03:00
parent ebbe22b09a
commit db30358d06
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -34,7 +34,7 @@ matrix:
dist: xenial dist: xenial
- os: osx - os: osx
- os: windows - os: windows
python: "3.6" env: PYTHONENCODING=UTF-8
before_script: before_script:
- sh scripts/travis_common_deps.sh - sh scripts/travis_common_deps.sh
- sh scripts/travis_${TRAVIS_OS_NAME}_deps.sh - sh scripts/travis_${TRAVIS_OS_NAME}_deps.sh
@ -48,5 +48,5 @@ after_script:
- cd ${TRAVIS_BUILD_DIR} - cd ${TRAVIS_BUILD_DIR}
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ccache --show-stats; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ccache --show-stats; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh scripts/travis-deploy.sh newengine Xash3DFWGS-i386.AppImage xash3d-mingw.7z; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh scripts/travis-deploy.sh newengine Xash3DFWGS-i386.AppImage xash3d-mingw.7z; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sh scripts/travis-deploy.sh newengine xash3d-osx.7z; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sh scripts/travis-deploy.sh newengine xash3d-osx.tar.bz2; fi
- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then sh scripts/travis-deploy.sh newengine xash3d-vc.7z; fi - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then sh scripts/travis-deploy.sh newengine xash3d-vc.7z; fi

4
scripts/build_osx_engine.sh
View File

@ -5,10 +5,6 @@
# Build engine # Build engine
cd $TRAVIS_BUILD_DIR cd $TRAVIS_BUILD_DIR
export CC="/usr/bin/clang"
export CXX="/usr/bin/clang++"
export CFLAGS="-m32"
export CXXFLAGS="-m32"
python waf configure --sdl2=$HOME/Library/Frameworks/SDL2.framework/ --vgui=$TRAVIS_BUILD_DIR/vgui-dev --build-type=debug || die python waf configure --sdl2=$HOME/Library/Frameworks/SDL2.framework/ --vgui=$TRAVIS_BUILD_DIR/vgui-dev --build-type=debug || die
python waf build -j2 || die python waf build -j2 || die
mkdir -p pkg/ mkdir -p pkg/

9
scripts/travis-deploy.sh
View File

@ -50,7 +50,7 @@ init_repo_and_copy_files()
push_until_success() push_until_success()
{ {
git push travis-deploy-public $SOURCE_NAME-$TRAVIS_BRANCH git push travis-deploy-public $SOURCE_NAME-$TRAVIS_BRANCH
# probably will never occur, just in case # probably will never occur, just in case
count=0 count=0
while [ $? -ne 0 ] && [ $count -lt 5 ] while [ $? -ne 0 ] && [ $count -lt 5 ]
@ -85,7 +85,8 @@ SOURCE_NAME=$1
shift shift
PUSHED_COMMIT=$(curl --fail https://raw.githubusercontent.com/FWGS/xash3d-deploy/$SOURCE_NAME-$TRAVIS_BRANCH/commit.txt) PUSHED_COMMIT=$(curl --fail https://raw.githubusercontent.com/FWGS/xash3d-deploy/$SOURCE_NAME-$TRAVIS_BRANCH/commit.txt)
if [ $? -ne 0 ]; then echo "Pushed commit: $PUSHED_COMMIT"
if [ ! -z "$PUSHED_COMMIT" ]; then
REV_RANGE="HEAD...$PUSHED_COMMIT" REV_RANGE="HEAD...$PUSHED_COMMIT"
else else
REV_RANGE="HEAD" REV_RANGE="HEAD"
@ -95,13 +96,13 @@ git config --global user.name FWGS-deployer
git config --global user.email FWGS-deployer@users.noreply.github.com git config --global user.email FWGS-deployer@users.noreply.github.com
FILES=$* FILES=$*
if [ "$TRAVIS_COMMIT" != "$PUSHED_COMMIT" ]; then if [ "$TRAVIS_COMMIT" != "$PUSHED_COMMIT" ]; then
# Create new repo with new files # Create new repo with new files
init_repo_and_copy_files init_repo_and_copy_files
generate_readme generate_readme
commit_files commit_files
force_push force_push
else else
# download repo and commit new files # download repo and commit new files
download_repo_and_copy_files download_repo_and_copy_files

6
scripts/travis_windows_deps.sh
View File

@ -1,6 +1,10 @@
# python 2.7 cp65001 support
python -m pip install -U pip
pip install win-unicode-console
# SDL2 for VC prebuilt # SDL2 for VC prebuilt
curl http://libsdl.org/release/SDL2-devel-$SDL_VERSION-VC.zip -o SDL2.zip curl http://libsdl.org/release/SDL2-devel-$SDL_VERSION-VC.zip -o SDL2.zip
unzip SDL2.zip unzip SDL2.zip
mv SDL2-$SDL_VERSION SDL2_VC mv SDL2-$SDL_VERSION SDL2_VC
cd $TRAVIS_BUILD_DIR cd $TRAVIS_BUILD_DIR