Skip to content

Commit 41d004c

Browse files
authored
Merge branch 'coder:main' into main
2 parents 4642cf9 + 804ba5b commit 41d004c

25 files changed

Lines changed: 311 additions & 360 deletions

.github/dependabot.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ updates:
1616
interval: "monthly"
1717
time: "06:00"
1818
timezone: "America/Chicago"
19-
commit-message:
20-
prefix: "chore"
2119
labels: []
2220
ignore:
2321
# Ignore patch updates for all dependencies

.github/workflows/build.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
docs: ${{ steps.filter.outputs.docs }}
2626
helm: ${{ steps.filter.outputs.helm }}
2727
steps:
28-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
28+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
2929
- uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
3030
id: filter
3131
with:
@@ -55,7 +55,7 @@ jobs:
5555
name: Run prettier check
5656
runs-on: ubuntu-22.04
5757
steps:
58-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
58+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
5959
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
6060
with:
6161
node-version-file: .node-version
@@ -72,7 +72,7 @@ jobs:
7272
needs: changes
7373
if: needs.changes.outputs.docs == 'true'
7474
steps:
75-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
75+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
7676
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
7777
with:
7878
node-version-file: .node-version
@@ -89,7 +89,7 @@ jobs:
8989
needs: changes
9090
if: needs.changes.outputs.helm == 'true'
9191
steps:
92-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
92+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
9393
- uses: azure/setup-helm@dda3372f752e03dde6b3237bc9431cdc2f7a02a2 # v5.0.0
9494
with:
9595
token: ${{ secrets.GITHUB_TOKEN }}
@@ -103,7 +103,7 @@ jobs:
103103
needs: changes
104104
if: needs.changes.outputs.code == 'true'
105105
steps:
106-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
106+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
107107
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
108108
with:
109109
node-version-file: .node-version
@@ -121,7 +121,7 @@ jobs:
121121
if: needs.changes.outputs.ci == 'true'
122122
steps:
123123
- name: Checkout repo
124-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
124+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
125125
- name: Check workflow files
126126
run: |
127127
bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash) 1.7.9
@@ -134,7 +134,7 @@ jobs:
134134
needs: changes
135135
if: needs.changes.outputs.code == 'true'
136136
steps:
137-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
137+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
138138
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
139139
with:
140140
node-version-file: .node-version
@@ -144,7 +144,7 @@ jobs:
144144
test/package-lock.json
145145
- run: SKIP_SUBMODULE_DEPS=1 npm ci
146146
- run: npm run test:unit
147-
- uses: codecov/codecov-action@75cd11691c0faa626561e295848008c8a7dddffe # v5
147+
- uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
148148
if: success()
149149
with:
150150
token: ${{ secrets.CODECOV_TOKEN }}
@@ -163,12 +163,12 @@ jobs:
163163

164164
steps:
165165
- run: sudo apt update && sudo apt install -y libkrb5-dev
166-
- uses: awalsh128/cache-apt-pkgs-action@2c09a5e66da6c8016428a2172bd76e5e4f14bb17 # latest
166+
- uses: awalsh128/cache-apt-pkgs-action@681749ae568c81c2037cb9185e38b709b261bd2f # latest
167167
with:
168168
packages: quilt
169169
version: 1.0
170170

171-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
171+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
172172
with:
173173
submodules: true
174174
- run: quilt push -a
@@ -191,7 +191,7 @@ jobs:
191191
# embedded into the code). Use VSCODE_CACHE_VERSION to force a rebuild.
192192
- name: Fetch prebuilt linux-x64 Code package from cache
193193
id: cache-vscode
194-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
194+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
195195
with:
196196
path: lib/vscode-reh-web-linux-x64
197197
key: vscode-linux-x64-package-${{ secrets.VSCODE_CACHE_VERSION }}-${{ steps.vscode-rev.outputs.rev }}-${{ hashFiles('patches/*.diff', 'ci/build/build-vscode.sh') }}
@@ -219,7 +219,7 @@ jobs:
219219
if: needs.changes.outputs.code == 'true' || needs.changes.outputs.deps == 'true' || needs.changes.outputs.ci == 'true'
220220

221221
steps:
222-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
222+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
223223
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
224224
with:
225225
node-version-file: .node-version
@@ -256,7 +256,7 @@ jobs:
256256

257257
steps:
258258
- name: Cache Caddy
259-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
259+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
260260
id: caddy-cache
261261
with:
262262
path: |
@@ -269,7 +269,7 @@ jobs:
269269
mkdir -p ~/.cache/caddy
270270
tar -xzf caddy_2.5.2_linux_amd64.tar.gz --directory ~/.cache/caddy
271271
272-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
272+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
273273
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
274274
with:
275275
node-version-file: .node-version

.github/workflows/installer.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ubuntu-latest
3131
steps:
3232
- name: Checkout repo
33-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
33+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
3434

3535
- name: Install code-server
3636
run: ./install.sh
@@ -44,7 +44,7 @@ jobs:
4444
container: "alpine:3.17"
4545
steps:
4646
- name: Checkout repo
47-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
47+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
4848

4949
- name: Install curl
5050
run: apk add curl
@@ -67,7 +67,7 @@ jobs:
6767

6868
steps:
6969
- name: Checkout repo
70-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
70+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
7171

7272
- name: Install code-server
7373
run: ./install.sh

.github/workflows/publish.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
run: |
3434
echo "VERSION=${TAG#v}" >> $GITHUB_ENV
3535
36-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
36+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
3737
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
3838
with:
3939
node-version-file: .node-version
@@ -64,7 +64,7 @@ jobs:
6464
echo "VERSION=${TAG#v}" >> $GITHUB_ENV
6565
6666
- name: Checkout code-server-aur repo
67-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
67+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
6868
with:
6969
repository: "cdrci/code-server-aur"
7070
token: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }}
@@ -93,7 +93,7 @@ jobs:
9393
run: |
9494
git checkout -b update-version-${{ env.VERSION }}
9595
git add .
96-
git commit -m "chore: updating version to ${{ env.VERSION }}"
96+
git commit -m "Update to ${{ env.VERSION }}"
9797
git push -u origin $(git branch --show)
9898
gh pr create --repo coder/code-server-aur --title "chore: bump version to ${{ env.VERSION }}" --body "PR opened by @$GITHUB_ACTOR" --assignee $GITHUB_ACTOR
9999
@@ -108,9 +108,9 @@ jobs:
108108
run: |
109109
echo "VERSION=${TAG#v}" >> $GITHUB_ENV
110110
111-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
112-
- uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
113-
- uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
111+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
112+
- uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0
113+
- uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
114114

115115
- uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
116116
with:
@@ -149,7 +149,7 @@ jobs:
149149
run: |
150150
echo "VERSION=${TAG#v}" >> $GITHUB_ENV
151151
152-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
152+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
153153

154154
- run: ./ci/build/update-repo.sh
155155

.github/workflows/release.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959

6060
steps:
6161
- run: sudo apt update && sudo apt install -y libkrb5-dev
62-
- uses: awalsh128/cache-apt-pkgs-action@2c09a5e66da6c8016428a2172bd76e5e4f14bb17 # latest
62+
- uses: awalsh128/cache-apt-pkgs-action@681749ae568c81c2037cb9185e38b709b261bd2f # latest
6363
with:
6464
packages: quilt
6565
version: 1.0
@@ -76,7 +76,7 @@ jobs:
7676
version=4${version:1}
7777
echo "VERSION=$version" >> $GITHUB_ENV
7878
79-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
79+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
8080
with:
8181
submodules: true
8282
- run: quilt push -a
@@ -110,7 +110,7 @@ jobs:
110110
- run: |
111111
sed "/^## Unreleased/,/^## / ! d" CHANGELOG.md | head -n -2 | tail -n +3 > .cache/release-notes
112112
if: ${{ matrix.vscode_arch == 'x64' }}
113-
- uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1
113+
- uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
114114
if: ${{ matrix.vscode_arch == 'x64' }}
115115
with:
116116
draft: true
@@ -123,7 +123,7 @@ jobs:
123123
# Platform-specific release.
124124
- run: KEEP_MODULES=1 npm run release
125125
- run: npm run package
126-
- uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1
126+
- uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
127127
with:
128128
draft: true
129129
discussion_category_name: "📣 Announcements"
@@ -170,7 +170,7 @@ jobs:
170170
version=4${version:1}
171171
echo "VERSION=$version" >> $GITHUB_ENV
172172
173-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
173+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
174174
with:
175175
submodules: true
176176
- run: quilt push -a
@@ -189,7 +189,7 @@ jobs:
189189
- run: npm run test:native
190190

191191
- run: npm run package
192-
- uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1
192+
- uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
193193
with:
194194
draft: true
195195
discussion_category_name: "📣 Announcements"

.github/workflows/scripts.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
container: "alpine:3.17"
4242
steps:
4343
- name: Checkout repo
44-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
44+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
4545

4646
- name: Install test utilities
4747
run: apk add bats checkbashisms
@@ -58,7 +58,7 @@ jobs:
5858
timeout-minutes: 5
5959
steps:
6060
- name: Checkout repo
61-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
61+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
6262

6363
- name: Install lint utilities
6464
run: sudo apt install shellcheck

.github/workflows/security.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
timeout-minutes: 15
2626
steps:
2727
- name: Checkout repo
28-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
28+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
2929
with:
3030
fetch-depth: 0
3131

@@ -46,7 +46,7 @@ jobs:
4646
runs-on: ubuntu-22.04
4747
steps:
4848
- name: Checkout repo
49-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
49+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
5050
with:
5151
fetch-depth: 0
5252

@@ -62,7 +62,7 @@ jobs:
6262
severity: "HIGH,CRITICAL"
6363

6464
- name: Upload Trivy scan results to GitHub Security tab
65-
uses: github/codeql-action/upload-sarif@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4
65+
uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
6666
with:
6767
sarif_file: "trivy-repo-results.sarif"
6868

@@ -76,17 +76,17 @@ jobs:
7676

7777
steps:
7878
- name: Checkout repository
79-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
79+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
8080

8181
# Initializes the CodeQL tools for scanning.
8282
- name: Initialize CodeQL
83-
uses: github/codeql-action/init@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4
83+
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
8484
with:
8585
config-file: ./.github/codeql-config.yml
8686
languages: javascript
8787

8888
- name: Autobuild
89-
uses: github/codeql-action/autobuild@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4
89+
uses: github/codeql-action/autobuild@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
9090

9191
- name: Perform CodeQL Analysis
92-
uses: github/codeql-action/analyze@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4
92+
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4

.github/workflows/trivy-docker.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646

4747
steps:
4848
- name: Checkout code
49-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
49+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
5050

5151
- name: Run Trivy vulnerability scanner in image mode
5252
uses: aquasecurity/trivy-action@314ff8b43182423b84c50b1670b0e10f858f2d98 # latest
@@ -58,6 +58,6 @@ jobs:
5858
severity: "HIGH,CRITICAL"
5959

6060
- name: Upload Trivy scan results to GitHub Security tab
61-
uses: github/codeql-action/upload-sarif@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4
61+
uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
6262
with:
6363
sarif_file: "trivy-image-results.sarif"

.github/workflows/update.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
run: |
2929
echo "VERSION=${TAG#v}" >> $GITHUB_ENV
3030
31-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
31+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
3232
with:
3333
submodules: true
3434

@@ -47,7 +47,7 @@ jobs:
4747
echo done=false >> $GITHUB_OUTPUT
4848
fi
4949
50-
- uses: awalsh128/cache-apt-pkgs-action@2c09a5e66da6c8016428a2172bd76e5e4f14bb17 # latest
50+
- uses: awalsh128/cache-apt-pkgs-action@681749ae568c81c2037cb9185e38b709b261bd2f # latest
5151
if: steps.check.outputs.done == 'false'
5252
with:
5353
packages: quilt

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ Code v99.99.999
2222

2323
## Unreleased
2424

25+
## [4.124.2](https://github.com/coder/code-server/releases/tag/v4.124.2) - 2026-06-16
26+
2527
Code v1.124.2
2628

2729
### Security

0 commit comments

Comments
 (0)