Skip to content

Travis build fixes #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Sep 30, 2019
Merged

Travis build fixes #23

Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
9b904c9
added secret value and removed tests which run forever. testing travi…
jmwample Sep 13, 2019
2918b2e
adding forgotten files to commit
jmwample Sep 13, 2019
42323dc
commented out failing test
jmwample Sep 13, 2019
0a9396c
linter fixes
jmwample Sep 13, 2019
863fc3d
Trying 18.04 bionic for build with newer openssl
jmwample Sep 13, 2019
cacd01c
possible issue fix
jmwample Sep 13, 2019
3116aff
fixing patch file for conjure build
jmwample Sep 13, 2019
bc0b0c3
fixing tapdance build
jmwample Sep 13, 2019
3c590a2
Clean Disable for tests
jmwample Sep 13, 2019
638da95
digest ClientConf of current branch into Psiphon Android App.
jmwample Sep 14, 2019
ca9cec1
Added Psiphon Specific comments
jmwample Sep 16, 2019
80cfdf6
Small fixes
jmwample Sep 16, 2019
2294540
Merge branch 'dark-decoy' into travis-build
jmwample Sep 29, 2019
09d05a7
Adding Specific commit checkout for building psiphon library and apk
jmwample Sep 29, 2019
7385908
trying older commit
jmwample Sep 29, 2019
e694196
possible fix for build problems based on govendor issues.
jmwample Sep 30, 2019
6aa172c
accomodating relics of sergeyfrolov/gotapdance repo in Psiphon
jmwample Sep 30, 2019
41b7466
testing newer psiphon system commit
jmwample Sep 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ services:
addons:
artifacts: true

# # When Uncommented this will override the defaults set in travis ci web interface.
# env:
# - PSIPHON_CORE_VERSION="tags/v2.0.9"
# - PSIPHON_SYSTEM_VERSION="bae236c"

notifications:
slack:
secure: ZzIEqFE4XRdE9U2p3aeE32DMtoC8RgjoEavhEQ1oLrWFgUpLktqmp9UVY/U+W6iElilLpDbFpry51+Sv9MWpxJMxr+Q/JJuq/3Bj5KjF/wEtil7qvBYhQ1sM/qUQFG6wRkrMNjZGMiaTmnkWF0rZB8lf7+nbnGFaPW3AVVbD+8gVDWTHI4Hcvvgs0UbrJzoPfpvH0dprOchswc1BBKTgo5c44rvS2fquEMVcqMMiNJ5JQqphuRWLTfzLgOzImSf0/xJJyVp/YTkSnVSg8BcWmDCJ4iB9fJkVyZM9WxcgY/J4T5VzFxfMah9zv2j8UTfzHSMeCJDRL647hdnkmr/Qum/LN91Ey2DJw5KUH743CsAbyGhQML6wZ3NCeEP06hnMDphalU5+BYhtAPyc5CB84g6eLIUQ2EqptuPZpjFQohFnapCTnfB5XKTcW+PjxJsoJzk8x+85Xid+H1nnNxeyf10tLv6Pwy4ZGmEEbsa4SYWXibpIEu3fPJXEdtrht0vM40pDLeUYL6Axmh7hNjmDQOXJG41saF+Rk4AArRhKhMQTmlYCc0e1H2/hIDXUMPbqjHeCpEkaA5W8BFBKynhlJa0JX+rtHDFaK82Di8rXT0NO2ACyG8ZQqk87qePyBYPyfR8hRwhrkmQHlYYOZzV6LBz+ynJuWl9ktcC2irJlHZs=
Expand Down Expand Up @@ -42,10 +47,15 @@ jobs:
# Substitute build string
- sed -i.bak "s/buildInfo = \"\"/buildInfo = \"$TRAVIS_BRANCH-$TRAVIS_COMMIT\"/" tapdance/logger.go
- mkdir -p $GOPATH/src/github.com/Psiphon-Labs
# Get Specific Psiphon Core Library Release
- git clone https://github.com/Psiphon-Labs/psiphon-tunnel-core.git $GOPATH/src/github.com/Psiphon-Labs/psiphon-tunnel-core
- (cd $GOPATH/src/github.com/Psiphon-Labs/psiphon-tunnel-core && git checkout $PSIPHON_CORE_VERSION -b build-refraction-networking)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same only question as in #21: why did we switch the branch? Is Psiphon going to maintain that branch?

# Remove gotapdance from vendored packages
- go get github.com/kardianos/govendor
- (cd $GOPATH/src/github.com/Psiphon-Labs/psiphon-tunnel-core && govendor remove github.com/sergeyfrolov/gotapdance/...)
- (cd $GOPATH/src/github.com/Psiphon-Labs/psiphon-tunnel-core && govendor remove github.com/refraction-networking/gotapdance/...)
# replace sergeyfrolov in tapdance wrapper (NOTE: REMOVE AFTER VENDORING IN PSIPHON CHANGES)
- sed -i.bak 's/sergeyfrolov/refraction-networking/g' $GOPATH/src/github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common/tapdance/tapdance.go
# Enable TapDance logging
- sed -i.bak 's/refraction_networking_tapdance.Logger().Out = ioutil.Discard//' $GOPATH/src/github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common/tapdance/tapdance.go
# Digest this branch's ClientConf into Psiphon's embedded_config
Expand All @@ -69,6 +79,7 @@ jobs:
- docker pull refraction/psiandroid
- mkdir -p $GOPATH/src/bitbucket.org/psiphon
- hg clone https://bitbucket.org/psiphon/psiphon-circumvention-system $GOPATH/src/bitbucket.org/psiphon/psiphon-circumvention-system
- (cd $GOPATH/src/bitbucket.org/psiphon/psiphon-circumvention-system && hg checkout $PSIPHON_SYSTEM_VERSION)
# Use modified EmbeddedValues.java for TapDance
- openssl enc -nosalt -aes-256-cbc -md sha512 -pbkdf2 -iter 1000 -pass pass:$aes_cbc_passwd -d -in build/EmbeddedValues.java.enc -out $GOPATH/src/bitbucket.org/psiphon/psiphon-circumvention-system/Android/app/src/main/java/com/psiphon3/psiphonlibrary/EmbeddedValues.java
# Patched tunneling protocol for TapDance
Expand All @@ -89,6 +100,7 @@ jobs:
- docker pull refraction/psiandroid
- mkdir -p $GOPATH/src/bitbucket.org/psiphon
- hg clone https://bitbucket.org/psiphon/psiphon-circumvention-system $GOPATH/src/bitbucket.org/psiphon/psiphon-circumvention-system
- (cd $GOPATH/src/bitbucket.org/psiphon/psiphon-circumvention-system && hg checkout $PSIPHON_SYSTEM_VERSION)
# Use modified EmbeddedValues.java for TapDance
- openssl enc -nosalt -aes-256-cbc -md sha512 -pbkdf2 -iter 1000 -pass pass:$aes_cbc_passwd -d -in build/EmbeddedValues.java.enc -out $GOPATH/src/bitbucket.org/psiphon/psiphon-circumvention-system/Android/app/src/main/java/com/psiphon3/psiphonlibrary/EmbeddedValues.java
# Patched tunneling protocol for TapDance
Expand Down