fixed conflict in .travis.yml

Author: mauroc

.travis.yml

@@ -49,10 +49,10 @@ deploy:
   api_key:
     secure: "fAXQOEZd83GYDVDw+KOHEJwKWAD/ILVlT9vWl6FNQkjltIBVp0PpbkgRr/fQcGrQno7UMUZdPm+OIbWAq+0d675SoeZ8NFjGd884SzjslWauB8kRG7iK72Y0EAYqRHl83XqdspuCcBE24fU95C87DbQdhp/zmKi+NB8n3m0X4ifw2G6CNpUdaj9Oxq7dDIQikUTynmmIlTMXtNLr8aQRBihLVpMoIuWLyjskyxPuRU+jFkM0xAeyqy246ZFg0eK2HTIqhlSA/HJHlPHF0gBDxnjca5ZIGYC7s5rr03ghSIMAr6nLHCmAelWPp3+znwTzJ5mGv+4vKwOvOi3EMpCDtsDbh0ybMkSr3tdJzJ9TEsgZ6MIqC2X9bwKtQcW/cmSeJmmpUVhaIZ7KjYS3cIxlQ+jU0aIZupsf0P73rovTfNWuC919H9Ggu/Mc3rELwBUZ1FctxDFZ13cM1gnpbAZXA0xZGGK0AV3Y9M1BQ/RBcnez2OT7DAwYofYe2VAnvMJbYkJUKVVMsKZqPF+9fXGYhtVTpKw3j89nE98xRkIKiWQBmUE6x5XPSgxsI1CaDBIuZiXDO/IMh2v3HGiFlOC8qAuV6Z1vdHbaIFtzPkVEZ1miMBbD3XPki3Crl4kVXtGrCPAl6uH3YVrats9CL6shfgwzsS52zBacQxQu7RCrT6U="
   file_glob: true
-  file: "$TRAVIS_BUILD_DIR/build/*.{deb,rpm,dmg,txz,pkg,pkg.tar.xz,tar.gz}"
+  file: "$TRAVIS_BUILD_DIR/build/*.{deb,pkg}"
+
   skip_cleanup: true
   on:
     repo: mauroc/squiddio_pi
     tags: true
     all_branches: true
-    

CMakeLists.txt

@@ -39,7 +39,7 @@ SET(PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 SET(PKG_RELEASE "1")
 SET(PKG_API_VERSION "1.16")
 SET(PKG_AUTHOR "Mauro Calvi")
-SET(PKG_NVR ${PACKAGE_NAME}-${PACKAGE_VERSION}-${PKG_RELEASE})
+SET(PKG_NVR ${PACKAGE_NAME}-${PACKAGE_VERSION}.${PKG_RELEASE})
 SET(PKG_BASE_URL
   "https://dl.cloudsmith.io/public/mauro-calvi/squiddio-pi/raw/files")
 

ci/appveyor-upload.sh

@@ -6,6 +6,12 @@
 
 REPO='mauro-calvi/squiddio-pi'
 
+branch=$(git symbolic-ref --short HEAD)
+if [ "$branch" != 'master' ]; then
+    echo "Not on master branch, skipping deployment."
+    exit 0
+fi
+
 if [ -z "$CLOUDSMITH_API_KEY" ]; then
     echo 'Cannot deploy to cloudsmith, missing $CLOUDSMITH_API_KEY'
     exit 0

ci/circleci-build-macos.sh

@@ -4,24 +4,37 @@
 # Build the  MacOS artifacts 
 #
 
+# Fix broken ruby on the CircleCI image:
+if [ -n "$CI" ]; then
+    curl -fsSL \
+        https://raw.githubusercontent.com/Homebrew/install/master/uninstall \
+        > uninstall
+    chmod 755 uninstall
+    ./uninstall -f
+    inst="https://raw.githubusercontent.com/Homebrew/install/master/install"
+    /usr/bin/ruby -e "$(curl -fsSL $inst)"
+fi
+
+
 set -xe
 
+set -o pipefail
 for pkg in cairo libexif xz libarchive python3 wget cmake; do
-    brew list $pkg 2>&1 >/dev/null || brew install $pkg
+    brew list $pkg 2>/dev/null | head -10 || brew install $pkg
 done
 
-wget http://opencpn.navnux.org/build_deps/wx312_opencpn50_macos109.tar.xz
+wget -q http://opencpn.navnux.org/build_deps/wx312_opencpn50_macos109.tar.xz
 tar xJf wx312_opencpn50_macos109.tar.xz -C /tmp
 export PATH="/usr/local/opt/gettext/bin:$PATH"
 echo 'export PATH="/usr/local/opt/gettext/bin:$PATH"' >> ~/.bash_profile
 
 rm -rf build && mkdir build && cd build
 test -z "$TRAVIS_TAG" && CI_BUILD=OFF || CI_BUILD=ON
-cmake -DOCPN_CI_BUILD=$CI_BUILD \
-  -DOCPN_USE_LIBCPP=ON \
+cmake \
   -DwxWidgets_CONFIG_EXECUTABLE=/tmp/wx312_opencpn50_macos109/bin/wx-config \
   -DwxWidgets_CONFIG_OPTIONS="--prefix=/tmp/wx312_opencpn50_macos109" \
-  -DCMAKE_INSTALL_PREFIX=/tmp/opencpn -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 \
+  -DCMAKE_INSTALL_PREFIX=/tmp/opencpn \
+  -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 \
   ..
 make -sj2
 make package

ci/circleci-upload.sh

@@ -11,6 +11,12 @@ if [ -z "$CIRCLECI" ]; then
     exit 0;
 fi
 
+branch=$(git symbolic-ref --short HEAD)
+if [ "$branch" != 'master' ]; then
+    echo "Not on master branch, skipping deployment."
+    exit 0
+fi
+
 if [ -z "$CLOUDSMITH_API_KEY" ]; then
     echo 'Cannot deploy to cloudsmith, missing $CLOUDSMITH_API_KEY'
     exit 0

ci/travis-build-osx.sh

@@ -4,33 +4,52 @@
 # Build the Travis OSX artifacts 
 #
 
-# bailout on errors and echo commands
-curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/uninstall > uninstall
-chmod 755 uninstall
-./uninstall -f
-/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" 
+# As of travis-ci-macos-10.13-xcode9.4.1-1529955246, the travis osx image
+# contains a broken homebrew. Walk-around by reinstalling:
+if [ -n "$TRAVIS" ]; then
+    curl -fsSL \
+        https://raw.githubusercontent.com/Homebrew/install/master/uninstall \
+        > uninstall
+    chmod 755 uninstall
+    ./uninstall -f
+    inst="https://raw.githubusercontent.com/Homebrew/install/master/install"
+    /usr/bin/ruby -e "$(curl -fsSL $inst)"
+fi
 
+# bailout on errors and echo commands
 set -xe
 
-for pkg in cairo cmake libarchive libexif python3 wget xz; do
-    brew list $pkg || brew install $pkg
+set -o pipefail
+for pkg in cairo cmake curl libarchive libexif python3 wget xz; do
+    brew list $pkg 2>/dev/null | head -10 || brew install $pkg
 done
-curl --version >/dev/null || brew install curl
-wget http://opencpn.navnux.org/build_deps/wx312_opencpn50_macos109.tar.xz
+
+wget -q http://opencpn.navnux.org/build_deps/wx312_opencpn50_macos109.tar.xz
 tar xJf wx312_opencpn50_macos109.tar.xz -C /tmp
 export PATH="/usr/local/opt/gettext/bin:$PATH"
 echo 'export PATH="/usr/local/opt/gettext/bin:$PATH"' >> ~/.bash_profile
 
-mkdir  build
-cd build
-test -z "$TRAVIS_TAG" && CI_BUILD=OFF || CI_BUILD=ON
-cmake -DOCPN_CI_BUILD=$CI_BUILD \
-  -DOCPN_USE_LIBCPP=ON \
+mkdir build && cd build
+cmake  \
   -DwxWidgets_CONFIG_EXECUTABLE=/tmp/wx312_opencpn50_macos109/bin/wx-config \
   -DwxWidgets_CONFIG_OPTIONS="--prefix=/tmp/wx312_opencpn50_macos109" \
-  -DCMAKE_INSTALL_PREFIX=/tmp/opencpn -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 \
+  -DCMAKE_INSTALL_PREFIX=/tmp/opencpn \
+  -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 \
   ..
 make -sj2
 make package
-rm -rf /usr/local/lib/ruby/gems/ && brew reinstall ruby
-chmod 644 /usr/local/lib/lib*.dylib
+
+wget -q http://opencpn.navnux.org/build_deps/Packages.dmg
+hdiutil attach Packages.dmg
+sudo installer -pkg "/Volumes/Packages 1.2.5/Install Packages.pkg" -target "/"
+make install
+make create-pkg
+
+ls -l *.pkg *.tar.gz *.xml
+
+# As of travis-ci-macos-10.13-xcode9.4.1-1529955246, the travis osx image
+# contains a broken ruby setup used by deployment code. Walk around by
+# reinstalling:
+if [ -n "$TRAVIS" ]; then
+    rm -rf /usr/local/lib/ruby/gems/ && brew reinstall ruby
+fi