From 4e4752856b0767b38a3cd402138e624b2921da55 Mon Sep 17 00:00:00 2001 From: xawotihs Date: Mon, 9 Sep 2019 23:39:54 +0200 Subject: [PATCH] Removed mac specific build files --- tools/build-macos-script.sh | 37 ------------------------------------- tools/macos.travis.yml | 30 ------------------------------ 2 files changed, 67 deletions(-) delete mode 100755 tools/build-macos-script.sh delete mode 100644 tools/macos.travis.yml diff --git a/tools/build-macos-script.sh b/tools/build-macos-script.sh deleted file mode 100755 index 09a75aa90..000000000 --- a/tools/build-macos-script.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -e - -## New of branch to use -TRAVIS_MAC_BRANCH=travis_mac_osx - -## Only cross-compile on Mac the master branch -test "$TRAVIS_BRANCH" != "master" && exit 0 - -## Configure Git to use OAuth token -git config credential.helper "store --file=.git/credentials" -echo "https://${GH_TOKEN}:@github.com" > .git/credentials -git config --global user.name $GH_USER -git config --global user.email $GH_EMAIL -git remote set-url origin "https://${GH_TOKEN}@github.com/WagicProject/wagic.git" - -## Delete remote Travis-Mac branch (if any) -echo git branches = `git branch -r` -#export REMOTE=$(git branch -r | grep "origin/$TRAVIS_MAC_BRANCH") -#if [ "$REMOTE" = "origin/$TRAVIS_MAC_BRANCH" ]; then -# echo "Removing old $TRAVIS_MAC_BRANCH branch" -# # Delete remote branch -# git branch -r -D "origin/$TRAVIS_MAC_BRANCH" - # Push (delete) remote branch on temote server (e.g. github) - git push origin --delete "$TRAVIS_MAC_BRANCH" -#else -# echo "$REMOTE : No $TRAVIS_MAC_BRANCH to remove" -#fi - -## Create a new branch -git checkout -q -b "$TRAVIS_MAC_BRANCH" "$TRAVIS_BRANCH" - -## Write a new Travis-CI configuration file -cp tools/macos.travis.yml .travis.yml -git add .travis.yml -git commit -m "Auto-Updated Travis-CI configuration for Mac" -## Push new branch to remote server -git push -q origin $TRAVIS_MAC_BRANCH:$TRAVIS_MAC_BRANCH 2> /dev/null > /dev/null diff --git a/tools/macos.travis.yml b/tools/macos.travis.yml deleted file mode 100644 index 03743f4a2..000000000 --- a/tools/macos.travis.yml +++ /dev/null @@ -1,30 +0,0 @@ -language: objective-c - -before_install: -- brew update -- brew install qt5 -- sudo pip install pyjavaproperties -- sudo pip install github3.py -- brew install dpkg ldid -#- curl -s -f -L https://raw.github.com/r-plus/dotfiles/master/install_theos.sh | bash -- mkdir theos -- cd theos -- git clone --recursive https://github.com/theos/theos.git -- export THEOS="$TRAVIS_BUILD_DIR/theos" -- cd .. -- pwd -- ls -env: - global: - secure: "EBzr1+qjQsOhn0s+tcFmXR1jP9B0xiOSXuXbRXWZ1OEHNvp8+A5/pS84LYVFlaZqmxr5dApxvPtwhgLIUbQ3EPXm8LpC3KgSD4dS+9/QMbxhe5TK4oczgFRGcDTMJQZsCzhOh7hp3tbcbJg5Gp+VT7aFjFQSHDGwhzSJXsXwh/8=" - -script: -- /usr/local/opt/qt5/bin/qmake projects/mtg/wagic-qt.pro CONFIG+=graphics -- make -j 4 dmg -- cd projects/mtg/iOS -- make -j 4 package -- cd ../../.. - -after_success: -- python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l wagic.dmg -r Wagic-macosx.dmg -b $TRAVIS_BRANCH -- python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/iOS/net.wagic_0.19.2-1_iphoneos-arm.deb -r Wagic-iOS.deb -b $TRAVIS_BRANCH