From 6c0fc73201419bcb3c78bc238e8833170516a292 Mon Sep 17 00:00:00 2001 From: Luca Casonato Date: Thu, 18 Apr 2019 00:06:22 +0200 Subject: [PATCH 1/7] made spacing for travis yaml consistent in file --- .travis.yml | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5caa76686138..10dd11842aae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,25 +1,32 @@ language: node_js + node_js: - 10.15.1 + env: - VSCODE_VERSION="1.33.1" MAJOR_VERSION="1" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER-vsc$VSCODE_VERSION" + matrix: include: - - os: linux - dist: trusty - - os: osx + - os: linux + dist: trusty + - os: osx + before_install: -- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libxkbfile-dev - libsecret-1-dev; fi -- npm install -g yarn@1.12.3 + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libxkbfile-dev + libsecret-1-dev; fi + - npm install -g yarn@1.12.3 + script: -- scripts/build.sh + - scripts/build.sh + before_deploy: -- echo "$VERSION" "$TRAVIS_COMMIT" -- git config --local user.name "$USER_NAME" -- git config --local user.email "$USER_EMAIL" -- git tag "$VERSION" "$TRAVIS_COMMIT" -- yarn task package "$VERSION" + - echo "$VERSION" "$TRAVIS_COMMIT" + - git config --local user.name "$USER_NAME" + - git config --local user.email "$USER_EMAIL" + - git tag "$VERSION" "$TRAVIS_COMMIT" + - yarn task package "$VERSION" + deploy: provider: releases file_glob: true @@ -36,8 +43,9 @@ deploy: on: repo: codercom/code-server branch: master + cache: yarn: true timeout: 1000 directories: - - .cache + - .cache From da8bf0040e3c2a262268d28980caa9a640e86ec6 Mon Sep 17 00:00:00 2001 From: Luca Casonato Date: Thu, 18 Apr 2019 00:23:55 +0200 Subject: [PATCH 2/7] cleaned up .travis.yml and moved some code into a script --- .travis.yml | 51 +++++++++++++--------- scripts/{build.sh => cicd/build_binary.sh} | 0 scripts/cicd/git_tag.sh | 8 ++++ 3 files changed, 38 insertions(+), 21 deletions(-) rename scripts/{build.sh => cicd/build_binary.sh} (100%) mode change 100755 => 100644 create mode 100644 scripts/cicd/git_tag.sh diff --git a/.travis.yml b/.travis.yml index 10dd11842aae..2a87f97ea709 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,9 @@ language: node_js node_js: - 10.15.1 +services: + - docker + env: - VSCODE_VERSION="1.33.1" MAJOR_VERSION="1" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER-vsc$VSCODE_VERSION" @@ -18,31 +21,37 @@ before_install: - npm install -g yarn@1.12.3 script: - - scripts/build.sh + - scripts/cicd/build_binary.sh + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; docker build -t coder/code-server:$VERSION .; fi before_deploy: - - echo "$VERSION" "$TRAVIS_COMMIT" - - git config --local user.name "$USER_NAME" - - git config --local user.email "$USER_EMAIL" - - git tag "$VERSION" "$TRAVIS_COMMIT" - - yarn task package "$VERSION" + - scripts/cicd/git_tag.sh + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin hub.docker.com deploy: - provider: releases - file_glob: true - draft: true - tag_name: "$VERSION" - target_commitish: "$TRAVIS_COMMIT" - name: "$VERSION" - 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= - file: - - release/*.tar.gz - - release/*.zip - on: - repo: codercom/code-server - branch: master + - provider: releases + file_glob: true + draft: true + tag_name: "$VERSION" + target_commitish: "$TRAVIS_COMMIT" + name: "$VERSION" + 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= + file: + - release/*.tar.gz + - release/*.zip + on: + repo: codercom/code-server + branch: master + - provider: script + script: docker push coder/code-server:$VERSION + on: + repo: codercom/code-server + branch: master + condition: $TRAVIS_OS_NAME = linux + + cache: yarn: true diff --git a/scripts/build.sh b/scripts/cicd/build_binary.sh old mode 100755 new mode 100644 similarity index 100% rename from scripts/build.sh rename to scripts/cicd/build_binary.sh diff --git a/scripts/cicd/git_tag.sh b/scripts/cicd/git_tag.sh new file mode 100644 index 000000000000..c6b78c04d18b --- /dev/null +++ b/scripts/cicd/git_tag.sh @@ -0,0 +1,8 @@ +#!/bin/bash +set -e + +echo "$VERSION" "$TRAVIS_COMMIT" +git config --local user.name "$USER_NAME" +git config --local user.email "$USER_EMAIL" +git tag "$VERSION" "$TRAVIS_COMMIT" +yarn task package "$VERSION" \ No newline at end of file From 184c092988acf34c247d07341c58a95d96fa58fe Mon Sep 17 00:00:00 2001 From: Luca Casonato Date: Thu, 18 Apr 2019 00:28:21 +0200 Subject: [PATCH 3/7] checking if i can get travis to build this --- .travis.yml | 62 ++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2a87f97ea709..4ce573947247 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,48 +13,48 @@ matrix: include: - os: linux dist: trusty - - os: osx +# - os: osx -before_install: - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libxkbfile-dev - libsecret-1-dev; fi - - npm install -g yarn@1.12.3 +#before_install: + #- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libxkbfile-dev + # libsecret-1-dev; fi + #- npm install -g yarn@1.12.3 script: - - scripts/cicd/build_binary.sh - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; docker build -t coder/code-server:$VERSION .; fi + #- scripts/cicd/build_binary.sh + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; docker build -t creativeguy2013/code-server:$VERSION .; fi before_deploy: - - scripts/cicd/git_tag.sh + #- scripts/cicd/git_tag.sh - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin hub.docker.com deploy: - - provider: releases - file_glob: true - draft: true - tag_name: "$VERSION" - target_commitish: "$TRAVIS_COMMIT" - name: "$VERSION" - 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= - file: - - release/*.tar.gz - - release/*.zip - on: - repo: codercom/code-server - branch: master + #- provider: releases + # file_glob: true + # draft: true + # tag_name: "$VERSION" + # target_commitish: "$TRAVIS_COMMIT" + # name: "$VERSION" + # 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= + # file: + # - release/*.tar.gz + # - release/*.zip + # on: + # repo: codercom/code-server + # branch: master - provider: script - script: docker push coder/code-server:$VERSION + script: docker push creativeguy2013/code-server:$VERSION on: - repo: codercom/code-server - branch: master + #repo: codercom/code-server + #branch: master condition: $TRAVIS_OS_NAME = linux -cache: - yarn: true - timeout: 1000 - directories: - - .cache +#cache: +# yarn: true +# timeout: 1000 +# directories: +# - .cache From 68c6ae64476badd69c2d402edda450b4fefad800 Mon Sep 17 00:00:00 2001 From: Luca Casonato Date: Thu, 18 Apr 2019 00:30:52 +0200 Subject: [PATCH 4/7] travis --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4ce573947247..d8666e8c2b79 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ language: node_js - node_js: - 10.15.1 From 57dea46bafd112f84308aa94b9dee900f94cb226 Mon Sep 17 00:00:00 2001 From: Luca Casonato Date: Thu, 18 Apr 2019 00:35:04 +0200 Subject: [PATCH 5/7] fixed an if statement --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d8666e8c2b79..fcd34da8109a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ matrix: script: #- scripts/cicd/build_binary.sh - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; docker build -t creativeguy2013/code-server:$VERSION .; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t creativeguy2013/code-server:$VERSION .; fi before_deploy: #- scripts/cicd/git_tag.sh From 70a947a4589805596ae56a02b35eb909f25418d9 Mon Sep 17 00:00:00 2001 From: Luca Casonato Date: Thu, 18 Apr 2019 00:46:44 +0200 Subject: [PATCH 6/7] fixed travis.yml file --- .travis.yml | 58 ++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/.travis.yml b/.travis.yml index fcd34da8109a..dcacef08875b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,48 +12,48 @@ matrix: include: - os: linux dist: trusty -# - os: osx + - os: osx -#before_install: - #- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libxkbfile-dev - # libsecret-1-dev; fi - #- npm install -g yarn@1.12.3 +before_install: + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libxkbfile-dev + libsecret-1-dev; fi + - npm install -g yarn@1.12.3 script: - #- scripts/cicd/build_binary.sh + - scripts/cicd/build_binary.sh - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t creativeguy2013/code-server:$VERSION .; fi before_deploy: - #- scripts/cicd/git_tag.sh + - scripts/cicd/git_tag.sh - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin hub.docker.com deploy: - #- provider: releases - # file_glob: true - # draft: true - # tag_name: "$VERSION" - # target_commitish: "$TRAVIS_COMMIT" - # name: "$VERSION" - # 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= - # file: - # - release/*.tar.gz - # - release/*.zip - # on: - # repo: codercom/code-server - # branch: master + - provider: releases + file_glob: true + draft: true + tag_name: "$VERSION" + target_commitish: "$TRAVIS_COMMIT" + name: "$VERSION" + 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= + file: + - release/*.tar.gz + - release/*.zip + on: + repo: codercom/code-server + branch: master - provider: script script: docker push creativeguy2013/code-server:$VERSION on: - #repo: codercom/code-server - #branch: master + repo: codercom/code-server + branch: master condition: $TRAVIS_OS_NAME = linux -#cache: -# yarn: true -# timeout: 1000 -# directories: -# - .cache +cache: + yarn: true + timeout: 1000 + directories: + - .cache From 1479464b9ccf6a2fc5d1aa64f501c1eb84f15165 Mon Sep 17 00:00:00 2001 From: Luca Casonato Date: Thu, 18 Apr 2019 00:50:40 +0200 Subject: [PATCH 7/7] replaced my name with codercom --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index dcacef08875b..c06042950fbf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ before_install: script: - scripts/cicd/build_binary.sh - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t creativeguy2013/code-server:$VERSION .; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t codercom/code-server:$VERSION .; fi before_deploy: - scripts/cicd/git_tag.sh @@ -44,7 +44,7 @@ deploy: repo: codercom/code-server branch: master - provider: script - script: docker push creativeguy2013/code-server:$VERSION + script: docker push codercom/code-server:$VERSION on: repo: codercom/code-server branch: master