From 6dd5e515c5b64f85520b76183c70535aa6104266 Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 14 Jan 2020 13:07:58 -0600 Subject: [PATCH] Travis release on tags only and remove Docker push The manual tagging is necessary to sync up the releases of the two different CIs. --- .travis.yml | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index db0e0f615..34628a0ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,26 +17,18 @@ jobs: include: - name: "MacOS build" os: osx - if: tag IS blank script: travis_wait 60 scripts/ci.bash git: depth: 3 -before_deploy: - - echo "$TAG" "$TRAVIS_COMMIT" - - git config --local user.name "$USER_NAME" - - git config --local user.email "$USER_EMAIL" - - if ! git tag "$TAG" "$TRAVIS_COMMIT" ; then echo "$TAG already exists"; fi - - if [[ -n "$PUSH_DOCKER" ]] ; then echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin ; fi - deploy: - provider: releases file_glob: true draft: true - tag_name: "$TAG" + tag_name: "$TRAVIS_TAG" target_commitish: "$TRAVIS_COMMIT" - name: "$TAG" + name: "$TRAVIS_TAG" skip_cleanup: true api_key: secure: YL/x24KjYjgYXPcJWk3FV7FGxI79Mh6gBECQEcdlf3fkLEoKFVgzHBoUNWrFPzyR4tgLyWNAgcpD9Lkme1TRWTom7UPjXcwMNyLcLa+uec7ciSAnYD9ntLTpiCuPDD1u0LtRGclSi/EHQ+F8YVq+HZJpXTsJeAmOmihma3GVbGKSZr+BRum+0YZSG4w+o4TOlYzw/4bLWS52MogZcwpjd+hemBbgXLuGU2ziKv2vEKCZFbEeA16II4x1WLI4mutDdCeh7+3aLzGLwDa49NxtsVYNjyNFF75JhCTCNA55e2YMiLz9Uq69IXe/mi5F7xUaFfhIqqLNyKBnKeEOzu3dYnc+8n3LjnQ+00PmkF05nx9kBn3UfV1kwQGh6QbyDmTtBP07rtUMyI14aeQqHjxsaVRdMnwj9Q2DjXRr8UDqESZF0rmK3pHCXS2fBhIzLE8tLVW5Heiba2pQRFMHMZW+KBE97FzcFh7is90Ait3T8enfcd/PWFPYoBejDAdjwxwOkezh5N5ZkYquEfDYuWrFi6zRFCktsruaAcA+xGtTf9oilBBzUqu8Ie+YFWH5me83xakcblJWdaW/D2rLJAJH3m6LFm8lBqyUgDX5t/etob6CpDuYHu5D1J3XINOj/+aLAcadq6qlh70PMZS3zYffUu3JlzaD2amlSHIT8b5YXFc= @@ -45,15 +37,7 @@ deploy: - release/*.zip on: repo: cdr/code-server - branch: master - - - provider: script - skip_cleanup: true - script: docker build -f ./scripts/ci.dockerfile -t codercom/code-server:"$TAG" . && docker push codercom/code-server:"$TAG" - on: - repo: cdr/code-server - branch: master - condition: -n "$PUSH_DOCKER" + tags: true cache: timeout: 1000