diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 6c98b6e..0000000 --- a/.travis.yml +++ /dev/null @@ -1,320 +0,0 @@ -# if you update this file, please consider updating Vagrantfile too - -language: cpp - -env: - global: - - JOBS=4 - - SHADOW_BUILD_DIR=/tmp/shadow_build_dir - - CODESIGN=nocodesign - - secure: RGovyUnMw3fp/bHZi058JvANT1rYmNqrsuSYew0cIgirO6YbMHr/rsjwCm1FTYpBl8s1zgr+u2b8ftYnfnCz2YT+Aip4NWrVYpVU0FEmfytGILrnUS0pjlt8m7fU9AKR1ElOSll7yw7e1kftynN39Q321etvwbLZcXon6zz0suE= - -jobs: - fast_finish: true - include: - - stage: "Build" - name: "Linux Installer" - if: branch = master - os: linux - dist: bionic - env: SPEC=linux-g++-64 CONFIG=installer - sudo: required - - stage: "Build" - name: "Android 32 bit" - dist: xenial - language: android - env: SPEC=android-clang CONFIG=installer BITNESS=32 GSTREAMER_NAME=armv7 - sudo: false - - stage: "Build" - name: "Android 64 bit" - dist: xenial - language: android - env: SPEC=android-clang CONFIG=installer BITNESS=64 GSTREAMER_NAME=arm64 - sudo: false - - stage: "Build" - name: "OSX Installer" - if: branch = master - os: osx - osx_image: xcode11.3 - env: SPEC=macx-clang CONFIG=installer - sudo: required - - stage: "Google Play Upload" - name: "Google Play Upload" - dist: trusty - language: android - env: SPEC=google-play-upload - sudo: false - before_install: skip - install: skip - before_script: skip - before_deploy: skip - after_deploy: skip - script: echo "Google Play Upload" - -# iOS build needs updating Qt to > 5.10 -# - os: osx -# osx_image: xcode9.2 -# env: SPEC=macx-ios-clang CONFIG=release -# sudo: false -# OSX builds pared back to installer only since travis sucks so bad we can't afford more than one' -# - os: osx -# osx_image: xcode10.1 -# env: SPEC=macx-clang CONFIG=debug -# sudo: required - -android: - components: - - android-29 - - build-tools-25.0.3 - - platform-tools - -addons: - apt: - packages: - - speech-dispatcher - - libgstreamer-plugins-base1.0-dev - - libgstreamer1.0-0:amd64 - - libgstreamer1.0-dev - - libudev-dev - - wget - -before_install: - # fetch entire git repo to properly determine the version - - cd ${TRAVIS_BUILD_DIR} - - git fetch --unshallow - - git fetch --all --tags - - # compile threads - - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then - export JOBS=$((`cat /proc/cpuinfo | grep -c ^processor`+1)); - elif [ "${TRAVIS_OS_NAME}" = "osx" ]; then - export JOBS=$((`sysctl -n hw.ncpu`+1)); - fi - - # Linux needs sdl2 but not android - - if [ "${SPEC}" = "linux-g++-64" ]; then - sudo apt-get install -y libsdl2-dev libxkbcommon-x11-0; - fi - -install: - # linux dependencies: qt - - if [ "${SPEC}" = "linux-g++-64" ]; then - wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.12.6-gcc_64-min.tar.bz2 && - tar jxf Qt5.12.6-gcc_64-min.tar.bz2 -C /tmp && - export PATH=/tmp/Qt5.12-gcc_64/5.12.6/gcc_64/bin:$PATH - ; - fi - - # android dependencies: qt, gstreamer, android-ndk - - if [ "${SPEC}" = "android-clang" ]; then - wget --quiet https://gstreamer.freedesktop.org/data/pkg/android/1.18.5/gstreamer-1.0-android-universal-1.18.5.tar.xz && - mkdir gstreamer-1.0-android-universal-1.18.5 && - tar xf gstreamer-1.0-android-universal-1.18.5.tar.xz -C gstreamer-1.0-android-universal-1.18.5 && - wget --quiet https://dl.google.com/android/repository/android-ndk-r20-linux-x86_64.zip && - unzip android-ndk-r20-linux-x86_64.zip > /dev/null && - export ANDROID_NDK_ROOT=`pwd`/android-ndk-r20 && - export ANDROID_SDK_ROOT=/usr/local/android-sdk && - export PATH=`pwd`/android-ndk-r20:$PATH - ; - fi - - - if [[ "${SPEC}" = "android-clang" && "${BITNESS}" = "64" ]]; then - wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.12.6-android_arm64_v8a-min.tar.bz2 && - tar jxf Qt5.12.6-android_arm64_v8a-min.tar.bz2 -C /tmp && - export PATH=/tmp/Qt5.12-android_arm64_v8a/5.12.6/android_arm64_v8a/bin:$PATH - ; - fi - - - if [[ "${SPEC}" = "android-clang" && "${BITNESS}" = "32" ]]; then - wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.12.6-android_armv7-min.tar.bz2 && - tar jxf Qt5.12.6-android_armv7-min.tar.bz2 -C /tmp && - export PATH=/tmp/Qt5.12-android_armv7/5.12.6/android_armv7/bin:$PATH - ; - fi - - # osx dependencies: qt (master builds only: gstreamer, gstreamer-devel) - - if [ "${SPEC}" = "macx-clang" ]; then - wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.12.6-clang_64-min.tar.bz2 && - tar jxf Qt5.12.6-clang_64-min.tar.bz2 -C /tmp - ; - fi - - - if [[ "${SPEC}" = "macx-clang" ]]; then - wget --quiet https://qgroundcontrol.s3-us-west-2.amazonaws.com/dependencies/gstreamer-osx-1.18.1.tar.bz2 && - sudo tar zxf gstreamer-osx-1.18.1.tar.bz2 -C /Library/Frameworks - ; - fi - - - if [ "${SPEC}" = "macx-clang" ]; then - export QT_DIR=Qt5.12-clang_64/5.12.6/clang_64 && - export QT_QPA_PLATFORM_PLUGIN_PATH=/tmp/$QT_DIR/plugins && - export QML2_IMPORT_PATH=/tmp/$QT_DIR/qml && - export PATH=/tmp/$QT_DIR/bin:$PATH - ; - fi - - # ios dependencies: qt - - if [ "${SPEC}" = "macx-ios-clang" ]; then - wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.9.3-ios-min.tar.bz2 - ; - fi - - if [ "${SPEC}" = "macx-ios-clang" ]; then - tar jxf Qt5.9.3-ios-min.tar.bz2 -C /tmp && - export IOS_CCACHE_CC=`/usr/bin/xcrun -sdk iphoneos -find clang` && - export IOS_CCACHE_CXX=`/usr/bin/xcrun -sdk iphoneos -find clang++` && - export PATH=/tmp/Qt5.9-ios/5.9.3/ios/bin:$PATH - ; - fi - -before_script: - - cd ${TRAVIS_BUILD_DIR} - - # switch android config from installer to release if the android storepass isn't available - - if [[ "${SPEC}" = "android-clang" && "${CONFIG}" = "installer" && -z ${ANDROID_STOREPASS} ]]; then - export CONFIG=release; - fi - - # Update QGC version in AndroidManifest.xml based on git tag. We do not do this on pull requests - # since it is likely the tags out out of date on the pull and may cause an error. - - if [ "${SPEC}" = "android-clang" && "${TRAVIS_PULL_REQUEST}" = "false" ]]; then - git remote set-branches origin 'master' && - git fetch --tags origin master && - ./tools/update_android_version.sh ${BITNESS} ${TRAVIS_BRANCH}; - fi - - # Install signing cert into OSX keychain - - if [[ "${SPEC}" = "macx-clang" && "${TRAVIS_PULL_REQUEST}" = "false" ]]; then - export CODESIGN=codesign; - fi - - if [[ "${SPEC}" = "macx-clang" && "${TRAVIS_PULL_REQUEST}" = "false" ]]; then - openssl aes-256-cbc -K $MAC_CERT_KEY -iv $MAC_CERT_IV -in deploy/MacCertificates.p12.enc -out deploy/MacCertificates.p12 -d; - fi - - if [[ "${SPEC}" = "macx-clang" && "${TRAVIS_PULL_REQUEST}" = "false" ]]; then - source deploy/MacImportCert.sh; - fi - -script: - # run qmake - - mkdir ${SHADOW_BUILD_DIR} && cd ${SHADOW_BUILD_DIR} - - if [ "${TRAVIS_TAG}" ]; then - echo "Stable build" && - export STABLE_OR_DAILY=StableBuild; - else - echo "Daily build" && - export STABLE_OR_DAILY=DailyBuild; - fi - - qmake -r ${TRAVIS_BUILD_DIR}/qgroundcontrol.pro CONFIG+=${CONFIG} CONFIG+=${STABLE_OR_DAILY} CONFIG+=${CODESIGN} -spec ${SPEC}; - - # compile - - if [ "${SPEC}" != "macx-ios-clang" ]; then - make -j$JOBS; - else - xcodebuild -IDEBuildOperationMaxNumberOfConcurrentCompileTasks=$JOBS -configuration Release CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO | xcpretty -c && $(exit ${PIPESTATUS[0]}); - fi - #- ccache -s - - # unit tests linux - - if [[ "${SPEC}" = "linux-g++-64" && "${CONFIG}" = "debug" ]]; then - mkdir -p ~/.config/QtProject/ && - cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/.config/QtProject/ && - export QT_FATAL_WARNINGS=1 && - ./staging/qgroundcontrol-start.sh --unittest; - fi - -after_success: - # This is only used to upload android builds to Google Play - - cd ${TRAVIS_BUILD_DIR} - - if [ "${TRAVIS_TAG}" ]; then - GOOGLE_PLAY_PKG=org.mavlink.qgroundcontrol; - elif [ "${TRAVIS_BRANCH}" = "master" ]; then - GOOGLE_PLAY_PKG=org.mavlink.qgroundcontrolbeta; - else - GOOGLE_PLAY_PKG=none; - fi - - if [[ "${SPEC}" = "google-play-upload" && "${TRAVIS_PULL_REQUEST}" = "false" && "${GOOGLE_PLAY_PKG}" != "none" ]]; then - wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/builds/${TRAVIS_BRANCH}/QGroundControl32.apk && - wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/builds/${TRAVIS_BRANCH}/QGroundControl64.apk && - pip install --user --upgrade oauth2client && - pip install --user google-api-python-client pyopenssl ndg-httpsclient pyasn1 && - openssl aes-256-cbc -K $encrypted_25db6eb7c3fd_key -iv $encrypted_25db6eb7c3fd_iv -in android/Google_Play_Android_Developer-4432a3c4f5d1.json.enc -out android/Google_Play_Android_Developer-4432a3c4f5d1.json -d && - ./deploy/GooglePlayUpload.py ${GOOGLE_PLAY_PKG}; - fi - -before_deploy: - # create linux appimage - - cd ${TRAVIS_BUILD_DIR} - - if [[ "${SPEC}" = "linux-g++-64" && "${CONFIG}" = "installer" ]]; then - ./deploy/create_linux_appimage.sh ${TRAVIS_BUILD_DIR} ${SHADOW_BUILD_DIR}/staging ${SHADOW_BUILD_DIR}/package; - fi - -deploy: - # deploy installers to s3 builds/ if on a branch - - provider: s3 - edge: true # Use V2 provider to work around V1 bug - access_key_id: AKIAIVORNALE7NHD3T6Q - secret_access_key: - secure: BsLXeXUPsCJdX4tawrDnO8OFK5Hk4kzlDTiyH93En6TbjUargVAWDMcHVj7TUhr7+3Tao1W1zb0G4SJe9kHv+jrky0yE72KvoG3YAON0VXWKizxBAKkgHE2RxSTNAwDeKbi2G6YJfNDescBBfX7zEohShdXglQu7CGaUQKRaiI4= - bucket: qgroundcontrol - local_dir: ${SHADOW_BUILD_DIR}/package - upload-dir: builds/${TRAVIS_BRANCH} - acl: public_read - region: us-west-2 - skip_cleanup: true - on: - all_branches: true - condition: $CONFIG = installer - - # deploy tagged installers to s3 latest/ - - provider: s3 - edge: true # Use V2 provider to work around V1 bug - access_key_id: AKIAIVORNALE7NHD3T6Q - secret_access_key: - secure: BsLXeXUPsCJdX4tawrDnO8OFK5Hk4kzlDTiyH93En6TbjUargVAWDMcHVj7TUhr7+3Tao1W1zb0G4SJe9kHv+jrky0yE72KvoG3YAON0VXWKizxBAKkgHE2RxSTNAwDeKbi2G6YJfNDescBBfX7zEohShdXglQu7CGaUQKRaiI4= - bucket: qgroundcontrol - local_dir: ${SHADOW_BUILD_DIR}/package - upload-dir: latest - acl: public_read - region: us-west-2 - skip_cleanup: true - on: - tags: true - condition: $CONFIG = installer - - # deploy tagged installers to s3 version folder - - provider: s3 - edge: true # Use V2 provider to work around V1 bug - access_key_id: AKIAIVORNALE7NHD3T6Q - secret_access_key: - secure: BsLXeXUPsCJdX4tawrDnO8OFK5Hk4kzlDTiyH93En6TbjUargVAWDMcHVj7TUhr7+3Tao1W1zb0G4SJe9kHv+jrky0yE72KvoG3YAON0VXWKizxBAKkgHE2RxSTNAwDeKbi2G6YJfNDescBBfX7zEohShdXglQu7CGaUQKRaiI4= - bucket: qgroundcontrol - local_dir: ${SHADOW_BUILD_DIR}/package - upload-dir: ${TRAVIS_BRANCH} - acl: public_read - region: us-west-2 - skip_cleanup: true - on: - tags: true - condition: $CONFIG = installer - - # deploy installers to Github releases if on a tag - - provider: releases - edge: true # Use V2 provider to work around V1 bug - api-key: - secure: K/Zqr/FCC7QvzFxYvBtCinPkacQq2ubJ2qm982+38Zf/KjibVOF1dEbVdrGZmII6Tg5DaQzNXGYkg5PvYmJgT9xRsqeQjeYIUYqYZpAt+HYWA38AVfMU8jip/1P1wmwqD469nzJOBBa8yfsMs6Ca7tBaNl/zTxCRGnAgEzqtkdQ= - file_glob: true - file: - - ${SHADOW_BUILD_DIR}/qgc-app/package/qgroundcontrol.* - - ${SHADOW_BUILD_DIR}/qgc-app/package/QGroundControl.* - skip_cleanup: true - on: - tags: true - condition: $CONFIG = installer - condition: $SPEC != macx-clang # GitHub OSX deploy broken due to travis problem - -notifications: - webhooks: - urls: - - https://webhooks.gitter.im/e/60b033428ae9dc715662 - on_success: change - on_failure: always - on_start: never diff --git a/Vagrantfile b/Vagrantfile index 6ff2d60..48f546d 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,15 +1,33 @@ # -*- mode: ruby -*- # vi: set ft=ruby : -# if you update this file, please consider updating .travis.yml too - require 'yaml' current_dir = File.dirname(File.expand_path(__FILE__)) configfile = YAML.load_file("#{current_dir}/.vagrantconfig.yml") -travisfile = YAML.load_file("#{current_dir}/.travis.yml") yaml_config = configfile['configs']['dev'] +env_global = [ + 'JOBS=4', + 'SHADOW_BUILD_DIR=/tmp/shadow_build_dir', + 'CODESIGN=nocodesign', + 'secure: RGovyUnMw3fp/bHZi058JvANT1rYmNqrsuSYew0cIgirO6YbMHr/rsjwCm1FTYpBl8s1zgr+u2b8ftYnfnCz2YT+Aip4NWrVYpVU0FEmfytGILrnUS0pjlt8m7fU9AKR1ElOSll7yw7e1kftynN39Q321etvwbLZcXon6zz0suE=' +] + +packages = [ + 'build-essential', + 'fuse', + 'git', + 'libgstreamer-plugins-base1.0-dev', + 'libgstreamer1.0-0:amd64', + 'libgstreamer1.0-dev', + 'libsdl2-dev', + 'libudev-dev', + 'speech-dispatcher', + 'wget' +] + + Vagrant.configure(2) do |config| # This trick is used to prefer a VM box over docker config.vm.provider "virtualbox" @@ -114,8 +132,8 @@ MAKE :qt_deps_tarball => yaml_config['qt_deps_tarball'], :pro => yaml_config['pro'], :spec => yaml_config['spec'], - :apt_pkgs => (travisfile['addons']['apt']['packages']+['git', 'build-essential', 'fuse', 'libsdl2-dev']).join(' '), - :build_env => travisfile['env']['global'].select { |item| item.is_a?(String) }.join(' '), + :apt_pkgs => (packages).join(' '), + :build_env => env_global.select { |item| item.is_a?(String) }.join(' '), :project_root_dir => yaml_config['project_root_dir'], :qt_deps_unpack_parent_dir => yaml_config['qt_deps_unpack_parent_dir'], diff --git a/build_ios.sh b/build_ios.sh deleted file mode 100755 index ed58565..0000000 --- a/build_ios.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -if [ ! -d /Volumes/RAMDisk ] ; then - echo 'RAM Disk not found' - echo 'Only used for App Store builds. It will not work on your computer.' - exit 1 -fi -#-- Set to my local installation -QMAKE=/Users/gus/Applications/Qt/5.12.2/ios/bin/qmake -#-- Using Travis variables as this will eventually live there -SHADOW_BUILD_DIR=/Volumes/RAMDisk/build-qgroundcontrol-iOS-Release -TRAVIS_BUILD_DIR=/Users/gus/github/work/UpstreamQGC -#-- Build it -mkdir -p ${SHADOW_BUILD_DIR} && -cd ${SHADOW_BUILD_DIR} && -#-- Create project only (build using Xcode) -${QMAKE} -r ${TRAVIS_BUILD_DIR}/qgroundcontrol.pro CONFIG+=WarningsAsErrorsOn CONFIG-=debug_and_release CONFIG+=release CONFIG+=ForAppStore -sed -i .bak 's/com.yourcompany.${PRODUCT_NAME:rfc1034identifier}/org.QGroundControl.qgc/' ${SHADOW_BUILD_DIR}/QGroundControl.xcodeproj/project.pbxproj -#-- Create and build -#${QMAKE} -r ${TRAVIS_BUILD_DIR}/qgroundcontrol.pro CONFIG+=WarningsAsErrorsOn CONFIG-=debug_and_release CONFIG+=release CONFIG+=ForAppStore && -#xcodebuild -configuration Release -xcconfig ${TRAVIS_BUILD_DIR}/ios/qgroundcontrol_appstore.xcconfig