Skip to content

Commit 70bff41

Browse files
Daywin67Daywin67
committed
Merge remote-tracking branch 'upstream/main' into feat/remote-storage
# Conflicts: # patches/series
2 parents d34d93e + 14bdb36 commit 70bff41

63 files changed

Lines changed: 1230 additions & 592 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.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: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
docs: ${{ steps.filter.outputs.docs }}
2626
helm: ${{ steps.filter.outputs.helm }}
2727
steps:
28-
- uses: actions/checkout@v6
29-
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3
28+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6
29+
- uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
3030
id: filter
3131
with:
3232
filters: |
@@ -55,8 +55,8 @@ jobs:
5555
name: Run prettier check
5656
runs-on: ubuntu-22.04
5757
steps:
58-
- uses: actions/checkout@v6
59-
- uses: actions/setup-node@v6
58+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6
59+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
6060
with:
6161
node-version-file: .node-version
6262
cache: npm
@@ -72,8 +72,8 @@ jobs:
7272
needs: changes
7373
if: needs.changes.outputs.docs == 'true'
7474
steps:
75-
- uses: actions/checkout@v6
76-
- uses: actions/setup-node@v6
75+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6
76+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
7777
with:
7878
node-version-file: .node-version
7979
cache: npm
@@ -89,8 +89,8 @@ jobs:
8989
needs: changes
9090
if: needs.changes.outputs.helm == 'true'
9191
steps:
92-
- uses: actions/checkout@v6
93-
- uses: azure/setup-helm@dda3372f752e03dde6b3237bc9431cdc2f7a02a2 # v5.0.0
92+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6
93+
- uses: azure/setup-helm@9bc31f4ebc9c6b171d7bfbaa5d006ae7abdb4310 # v5.0.1
9494
with:
9595
token: ${{ secrets.GITHUB_TOKEN }}
9696
version: "v3.19.2"
@@ -103,8 +103,8 @@ jobs:
103103
needs: changes
104104
if: needs.changes.outputs.code == 'true'
105105
steps:
106-
- uses: actions/checkout@v6
107-
- uses: actions/setup-node@v6
106+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6
107+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
108108
with:
109109
node-version-file: .node-version
110110
cache: npm
@@ -121,7 +121,7 @@ jobs:
121121
if: needs.changes.outputs.ci == 'true'
122122
steps:
123123
- name: Checkout repo
124-
uses: actions/checkout@v6
124+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # 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,8 +134,8 @@ jobs:
134134
needs: changes
135135
if: needs.changes.outputs.code == 'true'
136136
steps:
137-
- uses: actions/checkout@v6
138-
- uses: actions/setup-node@v6
137+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6
138+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
139139
with:
140140
node-version-file: .node-version
141141
cache: npm
@@ -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@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v5
147+
- uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
148148
if: success()
149149
with:
150150
token: ${{ secrets.CODECOV_TOKEN }}
@@ -163,16 +163,16 @@ jobs:
163163

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

171-
- uses: actions/checkout@v6
171+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6
172172
with:
173173
submodules: true
174174
- run: quilt push -a
175-
- uses: actions/setup-node@v6
175+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
176176
with:
177177
node-version-file: .node-version
178178
cache: npm
@@ -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@v4
194+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
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') }}
@@ -205,20 +205,22 @@ jobs:
205205
# Push up an artifact containing the linux-x64 release.
206206
- run: KEEP_MODULES=1 npm run release
207207
- run: tar -czf package.tar.gz release
208-
- uses: actions/upload-artifact@v7
208+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
209209
with:
210210
name: linux-x64-package
211211
path: ./package.tar.gz
212212

213213
test-e2e:
214214
name: Run e2e tests
215215
runs-on: ubuntu-22.04
216+
env:
217+
LOG_LEVEL: debug
216218
needs: [changes, build]
217219
if: needs.changes.outputs.code == 'true' || needs.changes.outputs.deps == 'true' || needs.changes.outputs.ci == 'true'
218220

219221
steps:
220-
- uses: actions/checkout@v6
221-
- uses: actions/setup-node@v6
222+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6
223+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
222224
with:
223225
node-version-file: .node-version
224226
cache: npm
@@ -231,13 +233,13 @@ jobs:
231233
./test/node_modules/.bin/playwright install-deps
232234
./test/node_modules/.bin/playwright install
233235
234-
- uses: actions/download-artifact@v8
236+
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
235237
with:
236238
name: linux-x64-package
237239
- run: tar -xzf package.tar.gz
238240

239241
- run: CODE_SERVER_TEST_ENTRY=./release npm run test:e2e
240-
- uses: actions/upload-artifact@v7
242+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
241243
if: always()
242244
with:
243245
name: failed-test-videos
@@ -248,12 +250,13 @@ jobs:
248250
runs-on: ubuntu-22.04
249251
env:
250252
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
253+
LOG_LEVEL: debug
251254
needs: [changes, build]
252255
if: needs.changes.outputs.code == 'true' || needs.changes.outputs.deps == 'true' || needs.changes.outputs.ci == 'true'
253256

254257
steps:
255258
- name: Cache Caddy
256-
uses: actions/cache@v4
259+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
257260
id: caddy-cache
258261
with:
259262
path: |
@@ -266,8 +269,8 @@ jobs:
266269
mkdir -p ~/.cache/caddy
267270
tar -xzf caddy_2.5.2_linux_amd64.tar.gz --directory ~/.cache/caddy
268271
269-
- uses: actions/checkout@v6
270-
- uses: actions/setup-node@v6
272+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6
273+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
271274
with:
272275
node-version-file: .node-version
273276
cache: npm
@@ -280,7 +283,7 @@ jobs:
280283
./test/node_modules/.bin/playwright install-deps
281284
./test/node_modules/.bin/playwright install
282285
283-
- uses: actions/download-artifact@v8
286+
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
284287
with:
285288
name: linux-x64-package
286289
- run: tar -xzf package.tar.gz
@@ -289,7 +292,7 @@ jobs:
289292
- run: CODE_SERVER_TEST_ENTRY=./release npm run test:e2e:proxy
290293
- run: ~/.cache/caddy/caddy stop --config ./ci/Caddyfile
291294
if: always()
292-
- uses: actions/upload-artifact@v7
295+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
293296
if: always()
294297
with:
295298
name: failed-test-videos-proxy

‎.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@v6
33+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # 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@v6
47+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # 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@v6
70+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6
7171

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

‎.github/workflows/publish.yaml‎

Lines changed: 49 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ jobs:
3333
run: |
3434
echo "VERSION=${TAG#v}" >> $GITHUB_ENV
3535
36-
- uses: actions/checkout@v6
37-
- uses: actions/setup-node@v6
36+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6
37+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
3838
with:
3939
node-version-file: .node-version
4040

41-
- uses: robinraju/release-downloader@daf26c55d821e836577a15f77d86ddc078948b05 # v1.12
41+
- uses: robinraju/release-downloader@28fc21f50d76778e7023361aa1f863e717d3d56f # v1.13
4242
with:
4343
repository: "coder/code-server"
4444
tag: ${{ env.TAG }}
@@ -64,23 +64,24 @@ jobs:
6464
echo "VERSION=${TAG#v}" >> $GITHUB_ENV
6565
6666
- name: Checkout code-server-aur repo
67-
uses: actions/checkout@v6
67+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6
6868
with:
6969
repository: "cdrci/code-server-aur"
7070
token: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }}
7171
ref: "master"
7272

73-
- name: Merge in master
74-
run: |
75-
git remote add upstream https://github.com/coder/code-server-aur.git
76-
git fetch upstream
77-
git merge upstream/master
78-
7973
- name: Configure git
8074
run: |
8175
git config --global user.name cdrci
8276
git config --global user.email opensource@coder.com
8377
78+
- name: Fetch and reset master
79+
run: |
80+
git remote add upstream https://github.com/coder/code-server-aur.git
81+
git fetch upstream
82+
git reset --hard upstream/master
83+
git push --force
84+
8485
- name: Validate package
8586
uses: heyhusen/archlinux-package-action@c9f94059ccbebe8710d31d582f33ef4e84fe575c # v3.0.0
8687
with:
@@ -92,9 +93,9 @@ jobs:
9293
run: |
9394
git checkout -b update-version-${{ env.VERSION }}
9495
git add .
95-
git commit -m "chore: updating version to ${{ env.VERSION }}"
96+
git commit -m "Update to ${{ env.VERSION }}"
9697
git push -u origin $(git branch --show)
97-
gh pr create --repo coder/code-server-aur --title "chore: bump version to ${{ env.VERSION }}" --body "PR opened by @$GITHUB_ACTOR" --assignee $GITHUB_ACTOR
98+
gh pr create --repo coder/code-server-aur --title "Update to ${{ env.VERSION }}" --body "PR opened by @$GITHUB_ACTOR" --assignee $GITHUB_ACTOR
9899
99100
docker:
100101
runs-on: ubuntu-latest
@@ -107,31 +108,60 @@ jobs:
107108
run: |
108109
echo "VERSION=${TAG#v}" >> $GITHUB_ENV
109110
110-
- uses: actions/checkout@v6
111-
- uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
112-
- uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
111+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6
112+
- uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0
113+
- uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
113114

114-
- uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
115+
- uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
115116
with:
116117
username: ${{ secrets.DOCKER_USERNAME }}
117118
password: ${{ secrets.DOCKER_PASSWORD }}
118-
- uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
119+
- uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
119120
with:
120121
registry: ghcr.io
121122
username: ${{ github.actor }}
122123
password: ${{ secrets.GITHUB_TOKEN }}
123124

124-
- uses: robinraju/release-downloader@daf26c55d821e836577a15f77d86ddc078948b05 # v1.12
125+
- uses: robinraju/release-downloader@28fc21f50d76778e7023361aa1f863e717d3d56f # v1.13
125126
with:
126127
repository: "coder/code-server"
127128
tag: v${{ env.VERSION }}
128129
fileName: "*.deb"
129130
out-file-path: "release-packages"
130-
- uses: robinraju/release-downloader@daf26c55d821e836577a15f77d86ddc078948b05 # v1.12
131+
- uses: robinraju/release-downloader@28fc21f50d76778e7023361aa1f863e717d3d56f # v1.13
131132
with:
132133
repository: "coder/code-server"
133134
tag: v${{ env.VERSION }}
134135
fileName: "*.rpm"
135136
out-file-path: "release-packages"
136137

137138
- run: npm run publish:docker
139+
140+
repo:
141+
runs-on: ubuntu-latest
142+
env:
143+
GH_TOKEN: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }}
144+
TAG: ${{ inputs.version || github.ref_name }}
145+
needs: docker
146+
147+
steps:
148+
- name: Set version to tag without leading v
149+
run: |
150+
echo "VERSION=${TAG#v}" >> $GITHUB_ENV
151+
152+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6
153+
154+
- run: ./ci/build/update-repo.sh
155+
156+
- name: Open PR
157+
run: |
158+
git config --global user.name cdrci
159+
git config --global user.email opensource@coder.com
160+
git checkout -b "helm/$VERSION"
161+
git add .
162+
git commit -m "Update Helm chart and changelog with $VERSION"
163+
git push -u origin "$(git branch --show)"
164+
gh pr create \
165+
--repo coder/code-server \
166+
--body-file .cache/checklist \
167+
--title "Update Helm chart and changelog with $VERSION"

0 commit comments

Comments
 (0)