Skip to content

Commit dbceaff

Browse files
vrubezhnymickaelistria
authored andcommitted
Fix getting the ESLint LS package.json from GitHub
A workaround to avoid https://raw.githubusercontent.com download restriction limit Signed-off-by: Victor Rubezhny <[email protected]>
1 parent d17337f commit dbceaff

File tree

3 files changed

+24
-17
lines changed

3 files changed

+24
-17
lines changed

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ kind: Pod
1313
spec:
1414
containers:
1515
- name: container
16-
image: docker.io/mickaelistria/fedora-gtk3-mutter-java-node:34
16+
image: docker.io/vrubezhny/fedora-gtk3-mutter-java-node:6
1717
imagePullPolicy: Always
1818
tty: true
1919
command: [ "uid_entrypoint", "cat" ]

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ 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-11-openjdk-devel maven git
77
RUN dnf -y update && dnf -y install \
88
nodejs npm
99
RUN dnf -y install xz

org.eclipse.wildwebdeveloper/pom.xml

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,28 @@
2828
</filesets>
2929
</configuration>
3030
</plugin>
31+
<plugin>
32+
<groupId>org.apache.maven.plugins</groupId>
33+
<artifactId>maven-scm-plugin</artifactId>
34+
<version>2.0.0-M1</version>
35+
<executions>
36+
<execution>
37+
<id>fetch-eslint-ls-package.json</id>
38+
<goals>
39+
<goal>checkout</goal>
40+
</goals>
41+
<phase>generate-resources</phase>
42+
<configuration>
43+
<connectionUrl>scm:git:https://github.com/microsoft/vscode-eslint.git</connectionUrl>
44+
<scmVersionType>tag</scmVersionType>
45+
<scmVersion>release/2.2.2</scmVersion>
46+
<basedir>${project.build.directory}</basedir>
47+
<includes>server/package.json</includes>
48+
<checkoutDirectory>${project.build.directory}/vscode-eslint-ls/extension</checkoutDirectory>
49+
</configuration>
50+
</execution>
51+
</executions>
52+
</plugin>
3153
<plugin>
3254
<groupId>com.googlecode.maven-download-plugin</groupId>
3355
<artifactId>download-maven-plugin</artifactId>
@@ -83,21 +105,6 @@
83105
<outputDirectory>${project.build.directory}/vscode-eslint-ls</outputDirectory>
84106
</configuration>
85107
</execution>
86-
<execution>
87-
<id>fetch-eslint-ls-package.json</id>
88-
<phase>generate-resources</phase>
89-
<goals>
90-
<goal>wget</goal>
91-
</goals>
92-
<configuration>
93-
<skipCache>true</skipCache>
94-
<url>https://raw.githubusercontent.com/microsoft/vscode-eslint/release/2.2.2/server/package.json</url>
95-
<outputDirectory>${project.build.directory}/vscode-eslint-ls/extension/server</outputDirectory>
96-
<headers>
97-
<Authorization>${github.api.token}</Authorization>
98-
</headers>
99-
</configuration>
100-
</execution>
101108
</executions>
102109
</plugin>
103110
<plugin>

0 commit comments

Comments
 (0)