diff --git a/.travis.yml b/.travis.yml index 46a42d3d9..a6aa5c56d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,6 @@ language: cpp dist: trusty sudo: required -before_install: -- openssl aes-256-cbc -K $encrypted_f030ceebf8d9_key -iv $encrypted_f030ceebf8d9_iv - -in travis/travisci_builder_id_key.enc -out travis/travisci_builder_id_key -d -- chmod 600 travis/travisci_builder_id_key cache: ccache install: travis/install_deps.sh script: travis/compile.sh @@ -15,5 +11,3 @@ env: - PLATFORM="win32_dyn" - PLATFORM="android_arm" - PLATFORM="android_arm64" -addons: - ssh_known_hosts: download.kiwix.org diff --git a/travis/install_deps.sh b/travis/install_deps.sh index aabe2c60a..ce1cd71de 100755 --- a/travis/install_deps.sh +++ b/travis/install_deps.sh @@ -2,11 +2,8 @@ set -e - REPO_NAME=${TRAVIS_REPO_SLUG#*/} ARCHIVE_NAME=deps_${PLATFORM}_${REPO_NAME}.tar.gz -SSH_KEY=${TRAVIS_BUILD_DIR}/travis/travisci_builder_id_key - # Packages. case ${PLATFORM} in @@ -42,10 +39,9 @@ git checkout release ./configure.py --bootstrap sudo cp ninja /bin - # Dependencies comming from kiwix-build. cd ${HOME} -scp -v -p -i ${SSH_KEY} nightlybot@download.kiwix.org:~/travis_deps/${ARCHIVE_NAME} . +wget http://tmp.kiwix.org/ci/${ARCHIVE_NAME} mkdir -p BUILD_${PLATFORM} cd BUILD_${PLATFORM} tar xf ${HOME}/${ARCHIVE_NAME} diff --git a/travis/travisci_builder_id_key.enc b/travis/travisci_builder_id_key.enc deleted file mode 100644 index 99638fdb6..000000000 Binary files a/travis/travisci_builder_id_key.enc and /dev/null differ diff --git a/travis/travisci_builder_id_key.pub b/travis/travisci_builder_id_key.pub deleted file mode 100644 index 12e88a21d..000000000 --- a/travis/travisci_builder_id_key.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCWxcsEawR4TrXmGgMXXOhuYjXtO1V/BpEQ2tuf2tTiloZ0n1cPtxeLp3ic7F91p/e+58U1QlpLkxs9Ia0REXvr2ppd3FuIRjADs6g9iqK4jgAx/KKVjy2vhtxFtDKP5xCkbqSRjDcYnSZwrllEPbsOEIgTvRBaOyyqBNbctjSN6DhB+hY1bsPNJntDL0/XLqSYFXBnxd+unRLiItRJX1C42tpTwWyr9OvpjuPCjWVo/6WqohU8xjW29xPDpmAnWCX02JD//hRamJ+zfDPxf5AGTVJhk7of4Jjj4pTunhTXRLGhA3UBPApbI//NA2nAOc8feOchu1VfO6n5JuVbnXDzUlMFVqSNJ6ihYBTEczN+T/xbdc3Uyzi3JZX7IW2lH1YpxJoGEzJ67HjNPHdKgQzqVGlKl00qUrL1aMJ+1rOm8xDvPYVjHidORPUn0x+2fvxJ0VVr4crVwmTa23ft79MS2sLbw5DbPkURVUkEH88nSwcbF9fbuCPE4RL15NS7ZNwDqRMyQIxnAe7Sf+UWz45HxTrdvgjrsk0PCYX+KCgnXEexXWDDlbXWuiJa1h2VhKb2zM3AUmtRMK0pFTi/xCrFFwDIYYIBOMxMb0nYmruv5Feh/cez1FNYq9+UKrnBAV7DAZCLibM2/u46OAgbbtZS70zaX1JvcX44yUgjpClNcQ== TravisCIBuilder