Skip to content

Commit cd37d16

Browse files
committed
Update Vscode extensions
vscode 1.63.2 --> 1.66.2 @angular/language-server 13.2.0 --> 13.3.2 typescript 4.5.5 --> 4.6.4 typescript-language-server 0.9.5 --> 0.9.7 yaml-language-server 1.3.0 --> 1.7.0 Signed-off-by: Victor Rubezhny <[email protected]>
1 parent d17337f commit cd37d16

File tree

3 files changed

+38
-15
lines changed

3 files changed

+38
-15
lines changed

Jenkinsfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ spec:
1919
command: [ "uid_entrypoint", "cat" ]
2020
resources:
2121
limits:
22-
memory: "4Gi"
22+
memory: "6Gi"
2323
cpu: "2000m"
2424
requests:
25-
memory: "4Gi"
25+
memory: "6Gi"
2626
cpu: "1000m"
2727
- name: jnlp
2828
image: 'eclipsecbi/jenkins-jnlp-agent'
@@ -45,6 +45,8 @@ spec:
4545
stage('Prepare-environment') {
4646
steps {
4747
container('container') {
48+
sh 'java -version'
49+
sh 'mvn --version'
4850
sh 'node --version'
4951
sh 'npm --version'
5052
sh 'npm config set cache="$WORKSPACE/npm-cache"'

docker/Dockerfile

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,26 @@ FROM eclipsecbi/fedora-gtk3-mutter:34-gtk3.24
33
# Back to root for install
44
USER 0
55
RUN dnf -y update && dnf -y install \
6-
java-11-openjdk-devel maven
6+
java-17-openjdk-devel maven
77
RUN dnf -y update && dnf -y install \
88
nodejs npm
99
RUN dnf -y install xz
1010

11-
RUN curl -L https://nodejs.org/dist/v16.13.0/node-v16.13.0-linux-x64.tar.xz | tar -xJ
11+
# OpenJ9 JDK 11
12+
#RUN curl -L https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.15%2B10_openj9-0.32.0/ibm-semeru-open-jdk_x64_linux_11.0.15_10_openj9-0.32.0.tar.gz | tar -xz
1213

13-
ENV PATH=/node-v16.13.0-linux-x64/bin:/usr/lib/jvm/java-11/bin:$PATH
14-
ENV JAVA_HOME=/usr/lib/jvm/java-11
14+
# OpenJ9 JDK 17
15+
RUN curl -L https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.3%2B7_openj9-0.32.0/ibm-semeru-open-jdk_x64_linux_17.0.3_7_openj9-0.32.0.tar.gz | tar -xz
16+
17+
RUN curl -L https://nodejs.org/dist/v16.14.2/node-v16.14.2-linux-x64.tar.xz | tar -xJ
18+
19+
# Env. vars using OpenJ9 JDK 11
20+
# ENV PATH=/node-v16.14.2-linux-x64/bin:/jdk-11.0.15+10/bin:$PATH
21+
# ENV JAVA_HOME=/jdk-11.0.15+10
22+
23+
# Env. vars using OpenJ9 JDK 17
24+
ENV PATH=/node-v16.14.2-linux-x64/bin:/jdk-17.0.3+7/bin:$PATH
25+
ENV JAVA_HOME=/jdk-17.0.3+7
1526

1627
#Back to named user
1728
USER 10001

org.eclipse.wildwebdeveloper/pom.xml

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<goal>wget</goal>
4040
</goals>
4141
<configuration>
42-
<url>https://az764295.vo.msecnd.net/stable/899d46d82c4c95423fb7e10e68eba52050e30ba3/code-stable-x64-1639562789.tar.gz</url>
42+
<url>https://az764295.vo.msecnd.net/stable/dfd34e8260c270da74b5c2d86d61aee4b6d56977/code-stable-x64-1649664837.tar.gz</url>
4343
<unpack>true</unpack>
4444
<outputDirectory>${project.build.directory}/vscode</outputDirectory>
4545
</configuration>
@@ -77,7 +77,7 @@
7777
<goal>wget</goal>
7878
</goals>
7979
<configuration>
80-
<url>https://dbaeumer.gallery.vsassets.io/_apis/public/gallery/publisher/dbaeumer/extension/vscode-eslint/2.2.2/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage</url>
80+
<url>https://dbaeumer.gallery.vsassets.io/_apis/public/gallery/publisher/dbaeumer/extension/vscode-eslint/2.2.3/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage</url>
8181
<outputFileName>vscode-eslint-ls.zip</outputFileName>
8282
<unpack>true</unpack>
8383
<outputDirectory>${project.build.directory}/vscode-eslint-ls</outputDirectory>
@@ -93,9 +93,19 @@
9393
<skipCache>true</skipCache>
9494
<url>https://raw.githubusercontent.com/microsoft/vscode-eslint/release/2.2.2/server/package.json</url>
9595
<outputDirectory>${project.build.directory}/vscode-eslint-ls/extension/server</outputDirectory>
96-
<headers>
97-
<Authorization>${github.api.token}</Authorization>
98-
</headers>
96+
<if>
97+
<condition>
98+
<not>
99+
<equals arg1="${github.api.token}" arg2="" />
100+
</not>
101+
</condition>
102+
<then>
103+
<headers>
104+
<Authorization>token ${github.api.token}</Authorization>
105+
</headers>
106+
</then>
107+
</if>
108+
99109
</configuration>
100110
</execution>
101111
</executions>
@@ -174,18 +184,18 @@
174184
<arg>--no-bin-links</arg>
175185
<arg>--ignore-scripts</arg>
176186
<arg>${project.build.directory}/node-debug2-1.43.0.tgz</arg>
177-
<arg>typescript@4.5.5</arg>
178-
<arg>[email protected].5</arg>
187+
<arg>typescript@4.6.4</arg>
188+
<arg>[email protected].7</arg>
179189
<arg>[email protected]</arg>
180190
<arg>[email protected]</arg>
181191
<arg>${project.build.directory}/vscode-css-languageserver-1.0.0.tgz</arg>
182192
<arg>${project.build.directory}/vscode-html-languageserver-1.0.0.tgz</arg>
183193
<arg>${project.build.directory}/vscode-json-languageserver-1.3.4.tgz</arg>
184-
<arg>yaml-language-server@1.3.0</arg>
194+
<arg>yaml-language-server@1.7.0</arg>
185195
<arg>[email protected]</arg>
186196
<arg>${project.build.directory}/debugger-for-chrome-4.13.0.tgz</arg>
187197
<arg>${project.build.directory}/eslint-server-2.1.25.tgz</arg>
188-
<arg>@angular/language-server@13.2.0</arg>
198+
<arg>@angular/language-server@13.3.2</arg>
189199
</arguments>
190200
<workingDirectory>${project.basedir}</workingDirectory>
191201
</configuration>

0 commit comments

Comments
 (0)