Skip to content

Commit 5681c87

Browse files
committed
Fix bugs in CI
1 parent 1aaa536 commit 5681c87

File tree

12 files changed

+40
-51
lines changed

12 files changed

+40
-51
lines changed

.stylelintrc.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
extends:
2-
- stylelint-config-standard
2+
- stylelint-config-recommended

.travis.yml

+6-17
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,26 @@ language: minimal
22

33
jobs:
44
include:
5-
- stage: Code
6-
name: Format
7-
script: ./ci/image/run.sh "yarn && yarn vscode && yarn fmt"
8-
- name: Lint
9-
script: ./ci/image/run.sh "yarn && yarn vscode && yarn lint"
105
- name: Test
11-
script: ./ci/image/run.sh "yarn && yarn vscode && yarn test"
12-
13-
- stage: Release
14-
name: Linux Release
6+
script: ./ci/image/run.sh "yarn && yarn vscode && ./ci/ci.sh"
7+
deploy: null
8+
- name: Linux Release
9+
if: tag IS present
1510
script:
1611
- travis_wait 60 ./ci/image/run.sh "yarn && yarn vscode && ci/release.sh"
1712
- ./ci/release-image/push.sh
1813
- name: Linux ARM64 Release
14+
if: tag IS present
1915
script:
2016
- travis_wait 60 ./ci/image/run.sh "yarn && yarn vscode && ci/release.sh"
2117
- ./ci/release-image/push.sh
2218
arch: arm64
2319
- name: MacOS Release
20+
if: tag IS present
2421
os: osx
2522
language: node_js
2623
node_js: 12
2724
script: yarn && yarn vscode && travis_wait 60 ci/release.sh
28-
- name: Docker Release
29-
script: ./ci/release-image/push.sh
30-
31-
stages:
32-
- name: Code
33-
- name: Release
34-
if: env(TRAVIS_TAG) IS present
3525

3626
deploy:
3727
- provider: releases
@@ -45,7 +35,6 @@ deploy:
4535
- release/*.zip
4636
on:
4737
tags: true
48-
condition: $TRAVIS_BUILD_STAGE_NAME == Release
4938

5039
cache:
5140
timeout: 600

ci/ci.sh

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/usr/bin/env bash
2+
set -euo pipefail
3+
4+
main() {
5+
cd "$(dirname "$0")/.."
6+
7+
yarn fmt
8+
yarn lint
9+
yarn test
10+
}
11+
12+
main "$@"

ci/image/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:12
1+
FROM node:12.14.0
22

33
RUN apt-get update && apt-get install -y \
44
libxkbfile-dev \

ci/lib.sh

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env bash
2+
set -euo pipefail
3+
4+
set_version() {
5+
local code_server_version=${VERSION:-${TRAVIS_TAG:-}}
6+
if [[ -z $code_server_version ]]; then
7+
code_server_version=$(grep version ./package.json | head -1 | awk -F: '{ print $2 }' | sed 's/[",]//g' | tr -d '[:space:]')
8+
fi
9+
export VERSION=$code_server_version
10+
}

ci/lint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -euo pipefail
44

55
main() {
66
eslint --max-warnings=0 --fix $(git ls-files "*.ts" "*.tsx" "*.js")
7-
stylelint --fix $(git ls-files "*.css")
7+
stylelint $(git ls-files "*.css")
88
tsc --noEmit
99
}
1010

ci/release-image/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ RUN rm -rf /var/lib/apt/lists/*
3333
EXPOSE 8080
3434
USER coder
3535
WORKDIR /home/coder
36-
ENTRYPOINT ["dumb-init", "fixuid", "-q", "code-server", "--host", "0.0.0.0"]
36+
ENTRYPOINT ["dumb-init", "fixuid", "-q", "code-server", "--host=0.0.0.0", "--auth=none"]

ci/release-image/push.sh

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ set -euo pipefail
44

55
main() {
66
cd "$(dirname "$0")/../.."
7+
soruce ./ci/lib.sh
8+
set_version
79

810
if [[ ${CI:-} ]]; then
911
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin

ci/release.sh

+2-5
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,9 @@ set -euo pipefail
66
# This script assumes that yarn has already ran.
77
function main() {
88
cd "$(dirname "${0}")/.."
9+
source ./ci/lib.sh
910

10-
local code_server_version=${VERSION:-${TRAVIS_TAG:-}}
11-
if [[ -z $code_server_version ]]; then
12-
code_server_version=$(grep version ./package.json | head -1 | awk -F: '{ print $2 }' | sed 's/[",]//g' | tr -d '[:space:]')
13-
fi
14-
export VERSION=$code_server_version
11+
set_version
1512

1613
# Always minify and package on CI since that's when releases are pushed.
1714
if [[ ${CI:-} ]]; then

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"parcel-bundler": "^1.12.4",
4040
"prettier": "^1.18.2",
4141
"stylelint": "^13.0.0",
42-
"stylelint-config-standard": "^19.0.0",
42+
"stylelint-config-recommended": "^3.0.0",
4343
"ts-node": "^8.4.1",
4444
"typescript": "3.7.2"
4545
},

src/browser/pages/global.css

+2-11
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,8 @@ body {
1010
background: #272727;
1111
color: #f4f4f4;
1212
margin: 0;
13-
font-family:
14-
-apple-system,
15-
BlinkMacSystemFont,
16-
"Segoe UI",
17-
Roboto,
18-
Helvetica,
19-
Arial,
20-
sans-serif,
21-
"Apple Color Emoji",
22-
"Segoe UI Emoji",
23-
"Segoe UI Symbol";
13+
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji",
14+
"Segoe UI Emoji", "Segoe UI Symbol";
2415
overflow: hidden;
2516
}
2617

yarn.lock

+1-13
Original file line numberDiff line numberDiff line change
@@ -1848,12 +1848,7 @@ chokidar@^2.1.5:
18481848
optionalDependencies:
18491849
fsevents "^1.2.7"
18501850

1851-
chownr@^1.1.1:
1852-
version "1.1.4"
1853-
resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
1854-
integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
1855-
1856-
chownr@^1.1.3:
1851+
chownr@^1.1.1, chownr@^1.1.3:
18571852
version "1.1.4"
18581853
resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
18591854
integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
@@ -6847,13 +6842,6 @@ stylelint-config-recommended@^3.0.0:
68476842
resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-3.0.0.tgz#e0e547434016c5539fe2650afd58049a2fd1d657"
68486843
integrity sha512-F6yTRuc06xr1h5Qw/ykb2LuFynJ2IxkKfCMf+1xqPffkxh0S09Zc902XCffcsw/XMFq/OzQ1w54fLIDtmRNHnQ==
68496844

6850-
stylelint-config-standard@^19.0.0:
6851-
version "19.0.0"
6852-
resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-19.0.0.tgz#66f0cf13f33b8a9e34965881493b38fc1313693a"
6853-
integrity sha512-VvcODsL1PryzpYteWZo2YaA5vU/pWfjqBpOvmeA8iB2MteZ/ZhI1O4hnrWMidsS4vmEJpKtjdhLdfGJmmZm6Cg==
6854-
dependencies:
6855-
stylelint-config-recommended "^3.0.0"
6856-
68576845
stylelint@^13.0.0:
68586846
version "13.2.0"
68596847
resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-13.2.0.tgz#b6f5b67b9a9a51f1fd105ab916952456d93826b4"

0 commit comments

Comments
 (0)