From 5b8d176d130ee869ee112e193dd72a413235ee5f Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Thu, 7 Nov 2019 09:04:37 +0000 Subject: [PATCH] Update travis github ssh key Openssl on ubuntu doesn't support the old method anymore --- .travis-github.enc | Bin 3264 -> 3408 bytes .travis.yml | 23 +++++++++++------------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.travis-github.enc b/.travis-github.enc index 381fb5657d281549a6f7f8f51937fbceb0f8775e..2bba5eef876e6a3caf6663dfa83171356d495fa0 100644 GIT binary patch literal 3408 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 literal 3264 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 diff --git a/.travis.yml b/.travis.yml index 234bf35f..15c48683 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,4 @@ language: cpp -env: - global: - # SECRET_KEY, used to push docs to github and to init coverity scans - - secure: "i2f2UVDnyHT/9z0U3XvgTj8eDERvnc1Wk7HpseEjb75JwGzqn/2R+RKHmoSrwK3hFgij2IMxZL19XtHFwMz9t5A/huAAKD74KMMI/QpeZEJ/sjT3CTLcE9HEVDdJOjc7dfLRxb2hZtgvx8clZIMrpeUdPhci8openff30KvXVbg=" - # DOCKER_USERNAME - - secure: "kiR372QH5Srye2beHVamOVLIPeXnDipWfzvzGJEZzbpH+aXsiD+CkbtulCR+XnKpnUAXQTmEc5ts1KjI9MGlxvP1ztxW8HMDGUMF4iFAjgZO8GyAZlH5I7pMEw7D5pn3W9y1LuCW5C9IsDcWnNTJkm32D7N34lLBCTQVw68ooDk=" - # DOCKER_PASSWORD - - secure: "FMKQarGQJ/MFXnQQWEnlWMM+XItbDPgm5tzCn4k36AsAB1s1SiQ08wmy2Ys/+kRvnPN3Clpl8P2C8CoRTMJ8WCUYZVmf3HsqvsLdrODyusR5/N1y5eOKWxo+t1qN2Jzt6oIi/ofUZdn5mdzt8yif+ufxoez+2ncZDt5HoB/suHE=" # These linux-specific parameters could be moved into matrix.include items, but that's lots of repetition sudo: required @@ -58,11 +50,14 @@ matrix: env: BUILD_TYPE=tarball BUILD_WITH=autoconf - stage: deploy os: linux + env: + # SECRET_KEY, used to push docs to github and to init coverity scans + - secure: "ne14MIcNsUNKjqtgrLHJTHXCUUMKfkV/o4sm2scWYOiIl8s1Hoqnx6mPYIr8qnedIra8fsI7sWVxXLDLd/KMTN9v9WpCwc6Sf45vYtkfrS+rNOr86wOeEbgaxDTsb2UDJhtK0InhhpkipA5jrFzQuMMMEB+JgBQltKV43wmd7Yc=" before_install: install: - if [[ "$TRAVIS_REPO_SLUG" == "znc/znc" && "$TRAVIS_PULL_REQUEST" == "false" && "$TRAVIS_BRANCH" == "master" ]]; then ATTEMPT_DEPLOY=yes; else ATTEMPT_DEPLOY=no; fi - - if [[ "$ATTEMPT_DEPLOY" == "yes" ]]; then openssl aes-256-cbc -d -in .travis-github.enc -out ~/znc-github-key -k ${SECRET_KEY}; fi - - export SECRET_KEY=no DOCKER_PASSWORD=no DOCKER_USERNAME=no + - if [[ "$ATTEMPT_DEPLOY" == "yes" ]]; then openssl aes-256-cbc -d -salt -pbkdf2 -in .travis-github.enc -out ~/znc-github-key -k ${SECRET_KEY}; fi + - export SECRET_KEY=no - if [[ "$ATTEMPT_DEPLOY" == "yes" ]]; then sudo apt-get update; fi - if [[ "$ATTEMPT_DEPLOY" == "yes" ]]; then sudo apt-get install -y doxygen graphviz python3-yaml; fi script: @@ -79,11 +74,16 @@ matrix: after_success: - stage: deploy os: linux + env: + # DOCKER_USERNAME + - secure: "kiR372QH5Srye2beHVamOVLIPeXnDipWfzvzGJEZzbpH+aXsiD+CkbtulCR+XnKpnUAXQTmEc5ts1KjI9MGlxvP1ztxW8HMDGUMF4iFAjgZO8GyAZlH5I7pMEw7D5pn3W9y1LuCW5C9IsDcWnNTJkm32D7N34lLBCTQVw68ooDk=" + # DOCKER_PASSWORD + - secure: "FMKQarGQJ/MFXnQQWEnlWMM+XItbDPgm5tzCn4k36AsAB1s1SiQ08wmy2Ys/+kRvnPN3Clpl8P2C8CoRTMJ8WCUYZVmf3HsqvsLdrODyusR5/N1y5eOKWxo+t1qN2Jzt6oIi/ofUZdn5mdzt8yif+ufxoez+2ncZDt5HoB/suHE=" before_install: install: - if [[ "$TRAVIS_REPO_SLUG" == "znc/znc" && "$TRAVIS_PULL_REQUEST" == "false" ]]; then ATTEMPT_DEPLOY=yes; else ATTEMPT_DEPLOY=no; fi - if [[ "$ATTEMPT_DEPLOY" == "yes" ]]; then echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin; fi - - export SECRET_KEY=no DOCKER_PASSWORD=no DOCKER_USERNAME=no + - export DOCKER_PASSWORD=no DOCKER_USERNAME=no script: - echo "$TRAVIS_BRANCH-$(git describe)" > .nightly - docker build --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` --build-arg VCS_REF=`git rev-parse HEAD` --build-arg VERSION_EXTRA=+docker-git- -t "zncbouncer/znc-git:$TRAVIS_BRANCH" -t "zncbouncer/znc-git:$TRAVIS_BRANCH-$(git describe)" . @@ -93,7 +93,6 @@ matrix: before_install: - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)" # https://github.com/travis-ci/travis-ci/issues/8920 - "echo os: [$TRAVIS_OS_NAME] build: [$BUILD_TYPE]" - - export SECRET_KEY=no DOCKER_PASSWORD=no DOCKER_USERNAME=no - export CFGFLAGS= MYCXXFLAGS= MYLDFLAGS= - if [[ "$BUILD_TYPE" == "tarball" ]]; then CFGFLAGS+=" --with-gtest=$TRAVIS_BUILD_DIR/third_party/googletest/googletest --with-gmock=$TRAVIS_BUILD_DIR/third_party/googletest/googlemock --disable-swig"; fi - if [[ "$BUILD_TYPE" == "asan" ]]; then MYCXXFLAGS+=" -fsanitize=address -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls -fPIE" MYLDFLAGS+=" -fsanitize=address -pie"; fi