Skip to content

Commit 831c9d7

Browse files
committed
Regenerated key for Travis deploy.
1 parent 6f7aad1 commit 831c9d7

File tree

1 file changed

+55
-63
lines changed

1 file changed

+55
-63
lines changed

.travis.yml

Lines changed: 55 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,69 @@
11
language: cpp
22
branches:
33
except:
4-
- "/^appveyor.*$/"
4+
- "/^appveyor.*$/"
55
matrix:
66
include:
7-
- os: linux
8-
dist: trusty
9-
sudo: required
10-
# - os: osx
11-
# osx_image: xcode9.2
7+
- os: linux
8+
dist: trusty
9+
sudo: required
1210
before_install:
13-
- |
14-
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
15-
sudo add-apt-repository --yes ppa:beineri/opt-qt-5.10.1-trusty
16-
sudo apt-get update -qq
17-
sudo apt-get install -qq libgsl0-dev qt510base qt510tools qt510svg
18-
else
19-
brew update --quiet
20-
brew install qt gsl
21-
export PATH="/usr/local/opt/qt/bin:$PATH"
22-
fi
11+
- "if [ \"$TRAVIS_OS_NAME\" == \"linux\" ]; then\n sudo add-apt-repository --yes
12+
ppa:beineri/opt-qt-5.10.1-trusty\n sudo apt-get update -qq\n sudo apt-get install
13+
-qq libgsl0-dev qt510base qt510tools qt510svg\nelse\n brew update --quiet\n brew
14+
install qt gsl\n export PATH=\"/usr/local/opt/qt/bin:$PATH\" \nfi\n"
2315
install:
24-
- source /opt/qt510/bin/qt510-env.sh
25-
- # Install QWT
26-
- cd $TRAVIS_BUILD_DIR/..
27-
- svn checkout svn://svn.code.sf.net/p/qwt/code/branches/qwt-6.1 qwt
28-
- cd qwt
29-
- QWT_ROOT_DIR=`pwd`
30-
- LD_LIBRARY_PATH=$(readlink -f lib):$LD_LIBRARY_PATH
31-
- qmake
32-
- make -j$(nproc)
33-
- # Install GSL
34-
- GSL_ROOT_DIR=/opt/gsl
35-
- cd $TRAVIS_BUILD_DIR/..
36-
- git clone https://github.com/ampl/gsl.git
37-
- cd gsl
38-
- mkdir build && cd build
39-
- cmake .. -DGSL_DISABLE_WARNINGS:BOOL=ON -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX:STRING=$GSL_ROOT_DIR
40-
- cmake --build . --target install
41-
- cd $GSL_ROOT_DIR
42-
- LD_LIBRARY_PATH=$(readlink -f lib):$LD_LIBRARY_PATH
16+
- source /opt/qt510/bin/qt510-env.sh
17+
-
18+
- cd $TRAVIS_BUILD_DIR/..
19+
- svn checkout svn://svn.code.sf.net/p/qwt/code/branches/qwt-6.1 qwt
20+
- cd qwt
21+
- QWT_ROOT_DIR=`pwd`
22+
- LD_LIBRARY_PATH=$(readlink -f lib):$LD_LIBRARY_PATH
23+
- qmake
24+
- make -j$(nproc)
25+
-
26+
- GSL_ROOT_DIR=/opt/gsl
27+
- cd $TRAVIS_BUILD_DIR/..
28+
- git clone https://github.com/ampl/gsl.git
29+
- cd gsl
30+
- mkdir build && cd build
31+
- cmake .. -DGSL_DISABLE_WARNINGS:BOOL=ON -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_BUILD_TYPE="Release"
32+
-DCMAKE_INSTALL_PREFIX:STRING=$GSL_ROOT_DIR
33+
- cmake --build . --target install
34+
- cd $GSL_ROOT_DIR
35+
- LD_LIBRARY_PATH=$(readlink -f lib):$LD_LIBRARY_PATH
4336
script:
44-
- cd $TRAVIS_BUILD_DIR
45-
- mkdir build
46-
- cd build
47-
- cmake .. -DQWT_ROOT_DIR=$QWT_ROOT_DIR -DGSL_ROOT_DIR=$GSL_ROOT_DIR -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:STRING=dist
48-
- cmake --build . --target install
49-
- |
50-
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
51-
wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
52-
chmod a+x linuxdeployqt-continuous-x86_64.AppImage
53-
# ls -lh
54-
# ldd dist/usr/bin/strata
55-
ARCH=x86_64 ./linuxdeployqt-continuous-x86_64.AppImage dist/strata.desktop -appimage -no-translations
56-
# find ./dist -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
57-
fi
37+
- cd $TRAVIS_BUILD_DIR
38+
- mkdir build
39+
- cd build
40+
- cmake .. -DQWT_ROOT_DIR=$QWT_ROOT_DIR -DGSL_ROOT_DIR=$GSL_ROOT_DIR -DCMAKE_BUILD_TYPE=Release
41+
-DCMAKE_INSTALL_PREFIX:STRING=dist
42+
- cmake --build . --target install
43+
- |
44+
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
45+
wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
46+
chmod a+x linuxdeployqt-continuous-x86_64.AppImage
47+
# ls -lh
48+
# ldd dist/usr/bin/strata
49+
ARCH=x86_64 ./linuxdeployqt-continuous-x86_64.AppImage dist/strata.desktop -appimage -no-translations
50+
# find ./dist -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
51+
fi
5852
after_success:
59-
- |
60-
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
61-
ls -lh
62-
VERSION=$(sed -ne 's/.*VERSION "\([0-9.]\+\)".*/\1/p' ../CMakeLists.txt)
63-
GITHASH=$(git rev-parse --short HEAD)
64-
APPIMAGE=Strata-v$VERSION-$GITHASH-x86_64.AppImage
65-
mv Strata-x86_64.AppImage $APPIMAGE
66-
curl --upload-file $APPIMAGE https://transfer.sh/$APPIMAGE
67-
fi
53+
- |
54+
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
55+
ls -lh
56+
VERSION=$(sed -ne 's/.*VERSION "\([0-9.]\+\)".*/\1/p' ../CMakeLists.txt)
57+
GITHASH=$(git rev-parse --short HEAD)
58+
APPIMAGE=Strata-v$VERSION-$GITHASH-x86_64.AppImage
59+
mv Strata-x86_64.AppImage $APPIMAGE
60+
curl --upload-file $APPIMAGE https://transfer.sh/$APPIMAGE
61+
fi
6862
deploy:
69-
skip_cleanup: true
7063
provider: releases
64+
skip_cleanup: true
7165
api_key:
72-
secure: Z2q1ECai8J5HcnofI8v/BkI0BVPrMzibyXw9gM6+xa2kUG14yTQCnO845HN+PkSbTcMbmmILxrssytlLoibQDFad6pbJKGRKxOrI9TSqnfl79ZzX/Q9Nbq3yvpksG4lWF2XHJvN74N+yVxkw2JsFdu8ikJEv0qR242uWY5/GodNMl/w0ck+aOwtGWNmyKA86opkg9p4kA3ZxzhzGyc9jKNdob/z/gG0SHKMp4j58xxRSC1ZohI8CssVOVZpyduGJuCLxHekd/0T1VXQGGhIWKnM72GYz1BjCus47I4S2Ss4xUWL2tDHdK2lfbZLeybeVFM8cQX17gmRZeyCikl8d0BlROGGu6Hb5TbLyok4j0QC1HRq9JVNHgv+OzahqLdoKYWeCcHewOZyQQ/0RErrQzDUw9SIbdf6RMC+9WXx7eVgv8PPsqNNgkRkQIldcbN6uB2wU58x1vx3VaU22eXolDNjKbhrYGi1k8CDjnFNg8P7G4B1jOWAFUMfs3CYfj9Hmf7UUA0HJV2KyVtsNilRV10Qz8DGmIc/umXITQS3UB0klEzfzS16QWRRMKXmTCD0JLpRukkXjcKpBxgIj6JcRxGzDlMd3qYFyM2VTXfWMS4UK5eEr+x2j8Z660ErSycNUIW3TblABhbOoFHsyjbvEVojhSGExzD6l1rSspvmL60A=
73-
file: $APPIMAGE
66+
secure: MTTLCPZqrh35PgB7AMwcGP3Ats31Uih9U88hdbxl4LWgo/vWetRm5TV0kO6zMPbih6aN4sOk6W+y20VR5Qbq45bjhd9PeROIoGWUcICwkE0wMaK/ROzInACR4JURuD0FXTgj3y7IRUrvDP2JcpcN/MBX8iFhsUkZTH5o1KolLM+wLZbCn0DWT3oPwfR6fu4aKnG/4HzEiyomdlrFLxiDhjB3eQrAEV1SLFgueB3/M2tJHF0MzZtJZfIxx1inli00ZW0FZ+nfpBr1+nCLQfjtI/evjZTgpiuuY4hpS3fH9Lwogc1RD+BnZetvOJjOfqg3Englx1odasOT0WFOgXpobC289+2dgKDfq0engTs0Fq7xXZNQyJh8WSiKbt8j4yhr8Yb57ORbLPYjaJnd0Mu8h5XOIPrzq712vFxkJZLfjv7ZU+EPiDde/dUBw/jWyeMYciJk3WVD06pq2C2VIlXEE0CcisJPyNoD9o02LjmMSJ4eGB0v3BdBjg43bLfdtBKiwzFDN8WMN6jb6sYWzXTqhVA63GwVjOLz+qJM5/92gpQB2Aaewk7Q7cHmSUhthtMP0tAeDABh0F+W1ICk8Qom1uo1RwE/el1LMY9/jAk3FIfoMZp6aHQAQFb6/7eGxXSALip3S1xg4e/FRe2gNx0juRObsirjqusF5S9IJczaJ4Q=
67+
file: "$APPIMAGE"
7468
on:
75-
os: linux
7669
repo: arkottke/strata
77-
tags: true

0 commit comments

Comments
 (0)