Skip to content

Commit e858d11

Browse files
Merge branch 'master' into feature/helm3
2 parents 96a78c9 + 35a2d71 commit e858d11

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

ci/README.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@ Make sure you have `$GITHUB_TOKEN` set and [hub](https://github.com/github/hub)
1818
1. Update in `package.json`
1919
2. Update in [./doc/install.md](../doc/install.md)
2020
2. GitHub actions will generate the `npm-package`, `release-packages` and `release-images` artifacts.
21+
1. You do not have to wait for these.
2122
3. Run `yarn release:github-draft` to create a GitHub draft release from the template with
2223
the updated version.
2324
1. Summarize the major changes in the release notes and link to the relevant issues.
2425
4. Wait for the artifacts in step 2 to build.
25-
5. Run `yarn release:github-assets` to download the `release-packages` artifact and
26-
upload them to the draft release.
26+
5. Run `yarn release:github-assets` to download the `release-packages` artifact.
27+
- It will upload them to the draft release.
2728
6. Run some basic sanity tests on one of the released packages.
29+
- Especially make sure the terminal works fine.
2830
7. Make sure the github release tag is the commit with the artifacts. This is a bug in
2931
`hub` where uploading assets in step 5 will break the tag.
3032
8. Publish the release and merge the PR.
@@ -36,7 +38,6 @@ Make sure you have `$GITHUB_TOKEN` set and [hub](https://github.com/github/hub)
3638
10. Wait for the npm package to be published.
3739
11. Update the homebrew package.
3840
- Send a pull request to [homebrew-core](https://github.com/Homebrew/homebrew-core) with the URL in the [formula](https://github.com/Homebrew/homebrew-core/blob/master/Formula/code-server.rb) updated.
39-
12. Make sure to add a release without the `v` prefix for autoupdate from `3.2.0`.
4041

4142
## dev
4243

ci/dev/image/exec.sh renamed to ci/dev/image/run.sh

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ main() {
1111
-v "$PWD:/src" \
1212
-w /src \
1313
-p 127.0.0.1:8080:8080 \
14+
-u "$(id -u):$(id -g)" \
15+
-e CI \
1416
"$(docker_build ./ci/images/debian8)" \
1517
"$@"
1618
}

doc/CONTRIBUTING.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ yarn watch
4646
To develop inside of an isolated docker container:
4747

4848
```shell
49-
./ci/dev/image/exec.sh yarn
50-
./ci/dev/image/exec.sh yarn vscode
51-
./ci/dev/image/exec.sh yarn watch
49+
./ci/dev/image/run.sh yarn
50+
./ci/dev/image/run.sh yarn vscode
51+
./ci/dev/image/run.sh yarn watch
5252
```
5353

5454
`yarn watch` will live reload changes to the source.
@@ -61,7 +61,7 @@ reset VS Code then run `yarn vscode:patch`.
6161
You can build with:
6262

6363
```shell
64-
./ci/steps/release.sh
64+
./ci/dev/image/run.sh ./ci/steps/release.sh
6565
```
6666

6767
Run your build with:
@@ -76,7 +76,7 @@ node .
7676
Build release packages (make sure you run `./ci/steps/release.sh` first):
7777

7878
```
79-
./ci/dev/image/exec.sh ./ci/steps/release-packages.sh
79+
./ci/dev/image/run.sh ./ci/steps/release-packages.sh
8080
# The standalone release is in ./release-standalone
8181
# .deb, .rpm and the standalone archive are in ./release-packages
8282
```

0 commit comments

Comments
 (0)