Skip to content

Commit ec7329e

Browse files
svorsvor
authored
chore: update some extensions; fix update-from-ovsx script (#80)
* chore: update some extensions; fix update-from-ovsx script Signed-off-by: Valeriy Svydenko <[email protected]> * code cleanup Signed-off-by: Valeriy Svydenko <[email protected]> * update versions of extensions after redhat-developer/devspaces#1071 Signed-off-by: Valeriy Svydenko <[email protected]> * fix build pr check Signed-off-by: Valeriy Svydenko <[email protected]> --------- Signed-off-by: Valeriy Svydenko <[email protected]>
1 parent b6f2c64 commit ec7329e

File tree

10 files changed

+115
-93
lines changed

10 files changed

+115
-93
lines changed

‎.ci/extension_build.sh

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#!/bin/bash
2+
#
3+
# Copyright (c) 2024 Red Hat, Inc.
4+
# This program and the accompanying materials are made
5+
# available under the terms of the Eclipse Public License 2.0
6+
# which is available at https://www.eclipse.org/legal/epl-2.0/
7+
#
8+
# SPDX-License-Identifier: EPL-2.0
9+
#
10+
# This script is used to check for updates to the Visual Studio plugins listed in plugin-config.json.
11+
12+
set -ex
13+
14+
echo "Checking for updates to the Visual Studio plugins listed in plugin-config.json"
15+
16+
MAIN_BRANCH="devspaces-3-rhel-8"
17+
curl -sSLo plugin-config-main.json https://raw.githubusercontent.com/redhat-developer/devspaces-vscode-extensions/$MAIN_BRANCH/plugin-config.json
18+
19+
pluginsConfig=$(jq -r '.Plugins | keys[]' <plugin-config.json)
20+
pluginsConfigMain=$(jq -r '.Plugins | keys[]' <plugin-config-main.json)
21+
22+
for plugin in $pluginsConfig; do
23+
# If it is a new extension and doesn't exist in the main branch, try to build it
24+
if [[ ! " ${pluginsConfigMain[*]} " =~ $plugin ]]; then
25+
echo "New extension found: $plugin"
26+
echo "Building $plugin"
27+
./build/build.sh "$plugin" --clean
28+
continue
29+
fi
30+
# If it is an existing extension, check if the revision has changed
31+
revision=$(jq -r --arg plugin "$plugin" '.Plugins[$plugin].revision' <plugin-config.json)
32+
revisionMain=$(jq -r --arg plugin "$plugin" '.Plugins[$plugin].revision' <plugin-config-main.json)
33+
if [[ "${revision}" != "${revisionMain}" ]]; then
34+
echo "Revision changed for $plugin"
35+
echo "Building $plugin"
36+
./build/build.sh "$plugin" --clean
37+
fi
38+
done

‎.github/workflows/extension-pr-check.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77
# SPDX-License-Identifier: EPL-2.0
88
#
99

10-
name: Extension Build
10+
name: Updated Extensions Build
1111
on:
1212
pull_request:
1313
paths:
14-
- '**/extension.json'
15-
- '**/Dockerfile'
14+
- 'plugin-config.json'
1615

1716
jobs:
1817
build-push:
@@ -27,7 +26,7 @@ jobs:
2726

2827
- name: Build extension
2928
run: |
30-
./.ci/extension_build_publish.sh build-publish origin/${{ github.base_ref }} ${{ github.event.pull_request.head.sha }}
29+
./.ci/extension_build.sh
3130
3231
3332
- name: Upload artifacts

‎atlassian.atlascode/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ RUN npm install -g ${extension_manager}
2525
RUN mkdir ./${extension_name}-src && cd ./${extension_name}-src && \
2626
git clone ${extension_repository} ${extension_name} && \
2727
cd ./${extension_name} && git checkout ${extension_revision} && \
28+
sed -i 's/NODE_OPTIONS=--openssl-legacy-provider//' package.json && \
2829
npm install -g @vscode/vsce@${extension_vsce} [email protected] && \
2930
if [[ -f yarn.lock ]]; then yarn install; \
3031
else npm install --unsafe-perm=true --allow-root; fi && \

‎build/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash -e
22
#
3-
# Copyright (c) 2023 Red Hat, Inc.
3+
# Copyright (c) 2024 Red Hat, Inc.
44
# This program and the accompanying materials are made
55
# available under the terms of the Eclipse Public License 2.0
66
# which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -53,9 +53,9 @@ EXTENSION_REPOSITORY=$(parse_json repository)
5353
EXTENSION_REVISION=$(parse_json revision)
5454

5555
#Defaults
56-
ubi8Image="nodejs-18:1-71.1698060565"
56+
ubi8Image="nodejs-18:1-102"
5757
packageManager="npm@latest"
58-
vsceVersion="2.17.0"
58+
vsceVersion="2.26.0"
5959

6060
EXTENSION_IMAGE=$(parse_json ubi8Image)
6161
if [[ $EXTENSION_IMAGE -eq "null" ]]; then

‎build/update-from-ovsx.sh

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright (c) 2023 Red Hat, Inc.
3+
# Copyright (c) 2024 Red Hat, Inc.
44
# This program and the accompanying materials are made
55
# available under the terms of the Eclipse Public License 2.0
66
# which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -25,7 +25,6 @@ usage()
2525
Requires:
2626
- plugin-config.json (redhat-developer/devspaces-vscode-extensions)
2727
- openvsx-sync.json (redhat-developer/devspaces/dependencies/che-plugin-registry)
28-
- download_vsix.sh (redhat-developer/devspaces/dependencies/che-plugin-registry)
2928
3029
They will be downloaded if not found."
3130
exit
@@ -41,19 +40,19 @@ while [[ "$#" -gt 0 ]]; do
4140
done
4241

4342
if [[ ! "${MIDSTM_BRANCH}" ]]; then
44-
MIDSTM_BRANCHh="$(git rev-parse --abbrev-ref HEAD 2>/dev/null || true)"
43+
MIDSTM_BRANCH="$(git rev-parse --abbrev-ref HEAD 2>/dev/null || true)"
4544
if [[ $MIDSTM_BRANCH != "devspaces-3."*"-rhel-8" ]]; then
4645
MIDSTM_BRANCH="devspaces-3-rhel-8"
4746
fi
4847
fi
4948

50-
# Check for openvsx-sync.json, plugin-config.json and download-vsix.sh
49+
# cleanup any previous runs
50+
rm -rf /tmp/vsix-sources/
51+
52+
# Check for openvsx-sync.json, plugin-config.json
5153
if [[ ! -f openvsx-sync.json ]]; then
5254
curl -sSLO https://raw.githubusercontent.com/redhat-developer/devspaces/$MIDSTM_BRANCH/dependencies/che-plugin-registry/openvsx-sync.json
5355
fi
54-
if [[ ! -f download_vsix.sh ]]; then
55-
curl -sSLO https://raw.githubusercontent.com/redhat-developer/devspaces/$MIDSTM_BRANCH/dependencies/che-plugin-registry/build/scripts/download_vsix.sh
56-
fi
5756
if [[ ! -f plugin-config.json ]]; then
5857
curl -sSLO https://raw.githubusercontent.com/redhat-developer/devspaces-vscode-extensions/$MIDSTM_BRANCH/plugin-config.json
5958
fi
@@ -67,11 +66,7 @@ replaceField()
6766
echo "${changed}" > "plugin-config.json"
6867
}
6968

70-
# Update openvsx-sync.json
71-
chmod +x -R *.sh
72-
./download_vsix.sh -b $MIDSTM_BRANCH -j ./openvsx-sync.json --no-download
73-
74-
# Read in openvsx-sync.sh to get list of pluginregistry plugins
69+
# Read in openvsx-sync.json to get list of pluginregistry plugins
7570
pluginsOVSX=$(cat openvsx-sync.json | jq -r '.[].id')
7671
pluginsConfig=$(cat plugin-config.json | jq -r '.Plugins | keys[]')
7772

‎felixfbecker.php-debug/Dockerfile renamed to ‎golang.go/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2020 Red Hat, Inc.
2+
# Copyright (c) 2024 Red Hat, Inc.
33
# This program and the accompanying materials are made
44
# available under the terms of the Eclipse Public License 2.0
55
# which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -24,10 +24,9 @@ RUN npm install -g ${extension_manager}
2424

2525
RUN mkdir ./${extension_name}-src && cd ./${extension_name}-src && \
2626
git clone ${extension_repository} ${extension_name} && \
27-
cd ./${extension_name} && git checkout ${extension_revision} && \
27+
cd ./${extension_name} && git checkout ${extension_revision} && cd extension && \
2828
npm install -g @vscode/vsce@${extension_vsce} [email protected] && \
2929
if [[ -f yarn.lock ]]; then yarn install; \
3030
else npm install --unsafe-perm=true --allow-root; fi && \
3131
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
32-
npm run build && \
3332
vsce package --out /${extension_name}.vsix

‎ms-toolsai.jupyter/Dockerfile

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2020 Red Hat, Inc.
2+
# Copyright (c) 2024 Red Hat, Inc.
33
# This program and the accompanying materials are made
44
# available under the terms of the Eclipse Public License 2.0
55
# which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -25,10 +25,9 @@ RUN npm install -g ${extension_manager}
2525
RUN mkdir ./${extension_name}-src && cd ./${extension_name}-src && \
2626
git clone ${extension_repository} ${extension_name} && \
2727
cd ./${extension_name} && git checkout ${extension_revision} && \
28-
npm install -g @vscode/vsce@${extension_vsce} [email protected] --unsafe-perm=true&& \
29-
npm install --unsafe-perm=true --allow-root && \
30-
dnf module install -y nodejs:16/common && \
31-
npm install @types/vscode react-is crypto --unsafe-perm=true && \
28+
npm install -g @vscode/vsce@${extension_vsce} && \
29+
npm ci --ignore-scripts --prefer-offline --no-audit && \
30+
npm install && \
3231
rm -rf ./.git && tar -czvf /${extension_name}-sources.tar.gz ./ && \
33-
#npm run package
34-
gulp clean && gulp prePublishBundle && vsce package -o /${extension_name}.vsix
32+
npm run package && \
33+
cp ms-toolsai-jupyter-insiders.vsix /${extension_name}.vsix

‎plugin-config.json

Lines changed: 36 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
"Plugins": {
55
"atlassian.atlascode": {
66
"repository": "https://bitbucket.org/atlassianlabs/atlascode",
7-
"revision": "3.0.9",
7+
"revision": "3.0.10",
88
"update": "true",
99
"packageManager": "[email protected]"
1010
},
1111
"bmewburn.vscode-intelephense-client": {
1212
"repository": "https://github.com/bmewburn/vscode-intelephense",
13-
"revision": "v1.10.2",
13+
"revision": "v1.10.4",
1414
"update": "true"
1515
},
1616
"dbaeumer.vscode-eslint": {
@@ -30,7 +30,7 @@
3030
},
3131
"eamodio.gitlens": {
3232
"repository": "https://github.com/gitkraken/vscode-gitlens",
33-
"revision": "v14.8.0",
33+
"revision": "v14.9.1",
3434
"update": "true",
3535
"ubi8Image": "nodejs-16:1-90",
3636
"packageManager": "[email protected]"
@@ -43,44 +43,39 @@
4343
},
4444
"esbenp.prettier-vscode": {
4545
"repository": "https://github.com/prettier/prettier-vscode",
46-
"revision": "v10.1.0",
46+
"revision": "v10.4.0",
4747
"update": "true",
4848
"packageManager": "[email protected]"
4949
},
50-
"felixfbecker.php-debug": {
51-
"repository": "https://github.com/xdebug/vscode-php-debug",
52-
"revision": "v1.32.1",
53-
"update": "true"
54-
},
5550
"github.vscode-pull-request-github": {
5651
"repository": "https://github.com/microsoft/vscode-pull-request-github",
57-
"revision": "v0.80.0",
52+
"revision": "v0.86.1",
5853
"update": "true",
5954
"packageManager": "[email protected]"
6055
},
6156
"gitlab.gitlab-workflow": {
6257
"repository": "https://gitlab.com/gitlab-org/gitlab-vscode-extension.git/",
63-
"revision": "v4.0.0",
58+
"revision": "v4.9.0",
6459
"update": "true"
6560
},
6661
"golang.go": {
6762
"repository": "https://github.com/golang/vscode-go",
68-
"revision": "v0.40.3",
63+
"revision": "v0.41.4",
6964
"update": "true"
7065
},
7166
"jfrog.jfrog-vscode-extension": {
7267
"repository": "https://github.com/jfrog/jfrog-vscode-extension",
73-
"revision": "2.9.6",
68+
"revision": "2.10.1",
7469
"update": "true"
7570
},
7671
"llvm-vs-code-extensions.vscode-clangd": {
7772
"repository": "https://github.com/clangd/vscode-clangd",
78-
"revision": "0.1.26",
73+
"revision": "0.1.28",
7974
"update": "true"
8075
},
8176
"ms-kubernetes-tools.vscode-kubernetes-tools": {
8277
"repository": "https://github.com/vscode-kubernetes-tools/vscode-kubernetes-tools",
83-
"revision": "1.3.15",
78+
"revision": "1.3.16",
8479
"update": "true"
8580
},
8681
"ms-python.isort": {
@@ -89,22 +84,21 @@
8984
"update": "true"
9085
},
9186
"ms-python.black-formatter": {
92-
"comment": "Version: 2024.0.0",
87+
"comment": "Version: 2024.2.0",
9388
"repository": "https://github.com/microsoft/vscode-black-formatter",
94-
"revision": "12df4056a0efbf9e320e944c970bcf285d897be3",
89+
"revision": "652cef95031be8a512f01e8c13e924ad7a67ba03",
9590
"update": "true"
9691
},
9792
"ms-python.python": {
9893
"repository": "https://github.com/microsoft/vscode-python",
99-
"revision": "v2024.0.1",
94+
"revision": "v2024.4.1",
10095
"update": "true"
10196
},
10297
"ms-toolsai.jupyter": {
103-
"comment": "Cannot be built due to https://github.com/microsoft/vscode-jupyter/issues/13260, tracked in https://issues.redhat.com/browse/CRW-4325",
98+
"comment": "Version: 2024.3.1",
10499
"repository": "https://github.com/microsoft/vscode-jupyter",
105-
"revision": "4733a075e8af70d358dba81987395c9150fe5802",
106-
"update": "false",
107-
"packageManager": "[email protected]"
100+
"revision": "29b78d8fc33983431f0a01248cd545abcda0d7e4",
101+
"update": "true"
108102
},
109103
"ms-toolsai.jupyter-keymap": {
110104
"comment": "Version: 1.1.2",
@@ -121,15 +115,15 @@
121115
"packageManager": "[email protected]"
122116
},
123117
"ms-toolsai.vscode-jupyter-cell-tags": {
124-
"comment": "Version: 0.1.8",
118+
"comment": "Version: 0.1.9",
125119
"repository": "https://github.com/Microsoft/vscode-jupyter-cell-tags",
126-
"revision": "5d4f72e96414442cf3afd91d8adb8fa6807fd778",
120+
"revision": "bbc509cd58549ff592943dce340d6d3f84a51e86",
127121
"update": "true"
128122
},
129123
"ms-toolsai.vscode-jupyter-slideshow": {
130-
"comment": "Version: 0.1.5",
124+
"comment": "Version: 0.1.6",
131125
"repository": "https://github.com/Microsoft/vscode-jupyter-slideshow",
132-
"revision": "2cf41f6d1f8c8045a6810ce922378ce731aac806",
126+
"revision": "dd2de712e89ca65f2fbe912f71c1133b52e3f252",
133127
"update": "true"
134128
},
135129
"ms-vscode.js-debug": {
@@ -151,20 +145,22 @@
151145
"update": "false"
152146
},
153147
"ms-dotnettools.vscode-dotnet-runtime": {
148+
"comment": "Version: 2.0.3",
154149
"repository": "https://github.com/dotnet/vscode-dotnet-runtime",
155-
"revision": "Runtime-v1.7.2",
150+
"revision": "606893d9dde25814ed5e6b0bf3fd9d763281e53d",
156151
"packageManager": "[email protected]",
157-
"update": "false"
152+
"update": "true"
158153
},
159154
"muhammad-sammy.csharp": {
160155
"repository": "https://github.com/muhammadsammy/free-omnisharp-vscode",
161-
"revision": "2.15.30",
156+
"revision": "2.23.15",
162157
"update": "true"
163158
},
164159
"redhat.ansible": {
160+
"comment": "Version: 24.4.0",
165161
"repository": "https://github.com/ansible/vscode-ansible",
166-
"revision": "v2.4",
167-
"update": "false",
162+
"revision": "bd6caef0acc2dc4f5ed0a1a3ab7fec5acd80183d",
163+
"update": "true",
168164
"packageManager": "[email protected]"
169165
},
170166
"redhat.fabric8-analytics": {
@@ -193,20 +189,19 @@
193189
},
194190
"redhat.vscode-openshift-connector": {
195191
"repository": "https://github.com/redhat-developer/vscode-openshift-tools",
196-
"revision": "1.11.0",
192+
"revision": "1.13.0",
197193
"update": "true"
198194
},
199195
"redhat.vscode-quarkus": {
196+
"comment": "Version: 1.17.0",
200197
"repository": "https://github.com/redhat-developer/vscode-quarkus",
201-
"revision": "v1.17.0",
202-
"update": "true",
203-
"ubi8Image": "nodejs-14:1-101",
204-
"packageManager": "[email protected]"
198+
"revision": "c225c2f85d8f680a8de335bb294013d27f1e7b51",
199+
"update": "true"
205200
},
206201
"redhat.vscode-redhat-account": {
207-
"comment": "Version: 0.1.0",
202+
"comment": "Version: 0.2.0",
208203
"repository": "https://github.com/redhat-developer/vscode-redhat-account",
209-
"revision": "b1e57fae4120291427bfea9685c4b069a2235405",
204+
"revision": "35fa63a507d66dc0c263777b2a020067fabee041",
210205
"update": "true"
211206
},
212207
"redhat.vscode-tekton-pipelines": {
@@ -238,17 +233,17 @@
238233
},
239234
"timonwong.shellcheck": {
240235
"repository": "https://github.com/vscode-shellcheck/vscode-shellcheck",
241-
"revision": "v0.35.0",
236+
"revision": "v0.37.1",
242237
"update": "true"
243238
},
244239
"vscjava.vscode-java-debug": {
245240
"repository": "https://github.com/microsoft/vscode-java-debug",
246-
"revision": "0.56.0",
241+
"revision": "0.57.0",
247242
"update": "true"
248243
},
249244
"vscjava.vscode-java-test": {
250245
"repository": "https://github.com/microsoft/vscode-java-test",
251-
"revision": "0.40.1",
246+
"revision": "0.41.1",
252247
"update": "true"
253248
},
254249
"xdebug.php-debug": {

0 commit comments

Comments
 (0)