Skip to content

Commit

Permalink
Merge branch 'coder:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
mtdowner authored Jul 13, 2024
2 parents 300d29a + 6467c60 commit 3e28eb3
Show file tree
Hide file tree
Showing 77 changed files with 1,676 additions and 1,662 deletions.
50 changes: 35 additions & 15 deletions .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
name: Bug report
description: File a bug report
title: "[Bug]: "
labels: ["bug", "triage"]
body:
- type: checkboxes
Expand All @@ -10,6 +9,7 @@ body:
options:
- label: I have searched the existing issues
required: true

- type: textarea
attributes:
label: OS/Web Information
Expand All @@ -28,62 +28,82 @@ body:
- `code-server --version`:
validations:
required: true

- type: textarea
attributes:
label: Steps to Reproduce
description: |
1. open code-server
2. install extension
3. run command
Please describe exactly how to reproduce the bug. For example:
1. Open code-server in Firefox
2. Install extension `foo.bar` from the extensions sidebar
3. Run command `foo.bar.baz`
value: |
1.
2.
3.
validations:
required: true

- type: textarea
attributes:
label: Expected
description: What should happen?
validations:
required: true

- type: textarea
attributes:
label: Actual
description: What actually happens?
validations:
required: true

- type: textarea
id: logs
attributes:
label: Logs
description: Run code-server with the --verbose flag and then paste any relevant logs from the server, from the browser console and/or the browser network tab. For issues with installation, include installation logs (i.e. output of `yarn global add code-server`).
render: shell

- type: textarea
attributes:
label: Screenshot/Video
description: Please include a screenshot, gif or screen recording of your issue.
validations:
required: false
- type: checkboxes

- type: dropdown
attributes:
label: Does this issue happen in VS Code or GitHub Codespaces?
description: Please try reproducing this issue in VS Code and GitHub Codespaces. If the bug reproduces in either VS Code or GitHub Codespaces, please submit the issue upstream instead (https://github.com/microsoft/vscode).
label: Does this bug reproduce in native VS Code?
description: If the bug reproduces in native VS Code, submit the issue upstream instead (https://github.com/microsoft/vscode).
options:
- label: I tested this in native VS Code.
required: false
- label: This does not happen in native VS Code.
required: false
- label: I tested this in GitHub Codespaces.
required: false
- label: This does not happen in GitHub Codespaces.
required: false
- Yes, this is also broken in native VS Code
- No, this works as expected in native VS Code
- This cannot be tested in native VS Code
- I did not test native VS Code
validations:
required: true

- type: dropdown
attributes:
label: Does this bug reproduce in GitHub Codespaces?
description: If the bug reproduces in GitHub Codespaces, submit the issue upstream instead (https://github.com/microsoft/vscode).
options:
- Yes, this is also broken in GitHub Codespaces
- No, this works as expected in GitHub Codespaces
- This cannot be tested in GitHub Codespaces
- I did not test GitHub Codespaces
validations:
required: true

- type: checkboxes
attributes:
label: Are you accessing code-server over a secure context?
description: code-server relies on service workers (which only work in secure contexts) for many features. Double-check that you are using a secure context like HTTPS or localhost.
options:
- label: I am using a secure context.
required: false

- type: textarea
attributes:
label: Notes
Expand Down
2 changes: 0 additions & 2 deletions .github/ISSUE_TEMPLATE/doc.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
---
name: Documentation improvement
about: Suggest a documentation improvement
title: "[Docs]: "
labels: "docs"
assignees: "@jsjoeio"
---

## What is your suggestion?
Expand Down
2 changes: 0 additions & 2 deletions .github/ISSUE_TEMPLATE/feature-request.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
---
name: Feature request
about: Suggest an idea to improve code-server
title: "[Feat]: "
labels: enhancement
assignees: ""
---

## What is your suggestion?
Expand Down
29 changes: 15 additions & 14 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:

- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v41
uses: tj-actions/changed-files@v44
with:
files: |
docs/**
Expand Down Expand Up @@ -76,14 +76,14 @@ jobs:

- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v41
uses: tj-actions/changed-files@v44
with:
files: |
ci/helm-chart/**
- name: Install helm
if: steps.changed-files.outputs.any_changed == 'true'
uses: azure/setup-helm@v3.5
uses: azure/setup-helm@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}

Expand All @@ -107,7 +107,7 @@ jobs:

- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v41
uses: tj-actions/changed-files@v44
with:
files: |
**/*.ts
Expand All @@ -124,7 +124,7 @@ jobs:
- name: Fetch dependencies from cache
if: steps.changed-files.outputs.any_changed == 'true'
id: cache-node-modules
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: "**/node_modules"
key: yarn-build-${{ hashFiles('**/yarn.lock') }}
Expand All @@ -147,7 +147,7 @@ jobs:
uses: actions/checkout@v4
- name: Check workflow files
run: |
bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/7fdc9630cc360ea1a469eed64ac6d78caeda1234/scripts/download-actionlint.bash)
bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash) 1.7.1
./actionlint -color -shellcheck= -ignore "set-output"
shell: bash

Expand All @@ -163,7 +163,7 @@ jobs:

- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v41
uses: tj-actions/changed-files@v44
with:
files: |
**/*.ts
Expand All @@ -179,7 +179,7 @@ jobs:
- name: Fetch dependencies from cache
if: steps.changed-files.outputs.any_changed == 'true'
id: cache-node-modules
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: "**/node_modules"
key: yarn-build-${{ hashFiles('**/yarn.lock') }}
Expand All @@ -195,7 +195,7 @@ jobs:
run: yarn test:unit

- name: Upload coverage report to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
if: success()
Expand All @@ -206,6 +206,7 @@ jobs:
timeout-minutes: 60
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
DISABLE_V8_COMPILE_CACHE: 1
steps:
- name: Checkout repo
uses: actions/checkout@v4
Expand All @@ -231,7 +232,7 @@ jobs:

- name: Fetch dependencies from cache
id: cache-node-modules
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: "**/node_modules"
key: yarn-build-code-server-${{ hashFiles('**/yarn.lock') }}
Expand Down Expand Up @@ -259,7 +260,7 @@ jobs:
# force a rebuild.
- name: Fetch prebuilt Code package from cache
id: cache-vscode
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: lib/vscode-reh-web-*
key: vscode-reh-package-${{ secrets.VSCODE_CACHE_VERSION }}-${{ steps.vscode-rev.outputs.rev }}-${{ hashFiles('patches/*.diff', 'ci/build/build-vscode.sh') }}
Expand Down Expand Up @@ -305,7 +306,7 @@ jobs:

- name: Fetch dependencies from cache
id: cache-node-modules
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: "**/node_modules"
key: yarn-build-${{ hashFiles('**/yarn.lock') }}
Expand Down Expand Up @@ -364,7 +365,7 @@ jobs:

- name: Fetch dependencies from cache
id: cache-node-modules
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: "**/node_modules"
key: yarn-build-${{ hashFiles('**/yarn.lock') }}
Expand Down Expand Up @@ -392,7 +393,7 @@ jobs:
./test/node_modules/.bin/playwright install
- name: Cache Caddy
uses: actions/cache@v3
uses: actions/cache@v4
id: caddy-cache
with:
path: |
Expand Down
16 changes: 12 additions & 4 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
cache: "yarn"

- name: Download npm package from release artifacts
uses: robinraju/release-downloader@v1.8
uses: robinraju/release-downloader@v1.11
with:
repository: "coder/code-server"
tag: ${{ github.event.inputs.version || github.ref_name }}
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
echo "VERSION=${TAG#v}" >> $GITHUB_ENV
- name: Validate package
uses: hapakaien/archlinux-package-action@v2
uses: heyhusen/archlinux-package-action@v2.2.1
env:
VERSION: ${{ env.VERSION }}
with:
Expand Down Expand Up @@ -183,14 +183,22 @@ jobs:
TAG="${{ github.event.inputs.version || github.ref_name }}"
echo "VERSION=${TAG#v}" >> $GITHUB_ENV
- name: Download release artifacts
uses: robinraju/release-downloader@v1.8
- name: Download deb artifacts
uses: robinraju/release-downloader@v1.11
with:
repository: "coder/code-server"
tag: v${{ env.VERSION }}
fileName: "*.deb"
out-file-path: "release-packages"

- name: Download rpm artifacts
uses: robinraju/release-downloader@v1.11
with:
repository: "coder/code-server"
tag: v${{ env.VERSION }}
fileName: "*.rpm"
out-file-path: "release-packages"

- name: Publish to Docker
run: ./ci/steps/docker-buildx-push.sh
env:
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,11 @@ jobs:
run: yarn test:integration

- name: Upload coverage report to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
if: success()
continue-on-error: true

# NOTE@jsjoeio - we do this so we can strip out the v
# i.e. v4.9.1 -> 4.9.1
Expand All @@ -94,7 +95,7 @@ jobs:
VERSION: ${{ env.VERSION }}
run: yarn package

- uses: softprops/action-gh-release@v1
- uses: softprops/action-gh-release@v2
with:
draft: true
discussion_category_name: "📣 Announcements"
Expand Down Expand Up @@ -190,7 +191,7 @@ jobs:
VERSION: ${{ env.VERSION }}
run: npm run package ${npm_config_arch}

- uses: softprops/action-gh-release@v1
- uses: softprops/action-gh-release@v2
with:
draft: true
discussion_category_name: "📣 Announcements"
Expand Down Expand Up @@ -221,7 +222,7 @@ jobs:
# next update Node we can probably remove this. For now, install
# setuptools since it contains distutils.
- name: Install Python utilities
run: python3 -m pip install setuptools
run: brew install python-setuptools

- name: Download npm package
uses: actions/download-artifact@v4
Expand Down Expand Up @@ -252,7 +253,7 @@ jobs:
VERSION: ${{ env.VERSION }}
run: yarn package

- uses: softprops/action-gh-release@v1
- uses: softprops/action-gh-release@v2
with:
draft: true
discussion_category_name: "📣 Announcements"
Expand All @@ -269,7 +270,7 @@ jobs:
with:
name: npm-release-package

- uses: softprops/action-gh-release@v1
- uses: softprops/action-gh-release@v2
with:
draft: true
discussion_category_name: "📣 Announcements"
Expand All @@ -281,7 +282,7 @@ jobs:
timeout-minutes: 15
steps:
- name: Download artifacts
uses: dawidd6/action-download-artifact@v3
uses: dawidd6/action-download-artifact@v6
id: download
with:
branch: ${{ github.ref }}
Expand Down
Loading

0 comments on commit 3e28eb3

Please sign in to comment.