From 43d2107493120877538a738781ccd5f6f6dca990 Mon Sep 17 00:00:00 2001 From: Emile Vauge Date: Mon, 4 Apr 2016 22:33:01 +0200 Subject: [PATCH] Add mkdoc in CI Signed-off-by: Emile Vauge --- .travis.yml | 38 ++++++++++++++++++++++--------------- .travis/traefik.id_rsa.enc | Bin 0 -> 3248 bytes script/deploy.sh | 7 +++++-- 3 files changed, 28 insertions(+), 17 deletions(-) create mode 100644 .travis/traefik.id_rsa.enc diff --git a/.travis.yml b/.travis.yml index b93c9a850..9373d8597 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,31 +1,39 @@ branches: except: - - /^v\d\.\d\.\d.*$/ - + - /^v\d\.\d\.\d.*$/ + env: REPO: $TRAVIS_REPO_SLUG VERSION: v1.0.0-beta.$TRAVIS_BUILD_NUMBER - + sudo: required services: - - docker +- docker + +before_install: +- openssl aes-256-cbc -K $encrypted_27087ae1f4db_key -iv $encrypted_27087ae1f4db_iv -in .travis/traefik.id_rsa.enc -out ~/.ssh/traefik.id_rsa -d +- eval "$(ssh-agent -s)" +- chmod 600 ~/.ssh/traefik.id_rsa +- ssh-add ~/.ssh/traefik.id_rsa install: - - sudo service docker stop - - sudo curl https://get.docker.com/builds/Linux/x86_64/docker-1.10.1 -o /usr/bin/docker - - sudo chmod +x /usr/bin/docker - - sudo service docker start +- sudo service docker stop +- sudo curl https://get.docker.com/builds/Linux/x86_64/docker-1.10.1 -o /usr/bin/docker +- sudo chmod +x /usr/bin/docker +- sudo service docker start +- pip install --user mkdocs +- pip install --user pymdown-extensions before_script: - - make validate - - make binary +- make validate +- make binary script: - - make test-unit - - make test-integration - - make crossbinary - - make image +- make test-unit +- make test-integration +- make crossbinary +- make image after_success: - - make deploy +- make deploy \ No newline at end of file diff --git a/.travis/traefik.id_rsa.enc b/.travis/traefik.id_rsa.enc new file mode 100644 index 0000000000000000000000000000000000000000..bb347b95dbd30d50f7d0b705f01ff7b970ad21ef GIT binary patch literal 3248 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 literal 0 HcmV?d00001 diff --git a/script/deploy.sh b/script/deploy.sh index 1c9b60a1d..c4b5b8285 100755 --- a/script/deploy.sh +++ b/script/deploy.sh @@ -16,16 +16,19 @@ sudo chmod +x /usr/bin/ghr # github release and tag ghr -t $GITHUB_TOKEN -u containous -r traefik --prerelease ${VERSION} dist/ +# update docs.traefik.io +mkdocs gh-deploy --clean + # update traefik-library-image repo (official Docker image) git config --global user.email "emile@vauge.com" git config --global user.name "Emile Vauge" -git clone https://github.com/containous/traefik-library-image.git +git clone git@github.com:containous/traefik-library-image.git cd traefik-library-image ./update.sh $VERSION git add -A echo $VERSION | git commit --file - echo $VERSION | git tag -a $VERSION --file - -git push -q --follow-tags https://emilevauge:${GITHUB_TOKEN}@github.com/containous/traefik-library-image.git +git push -q --follow-tags -u origin master # create docker image emilevauge/traefik (compatibility) docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS