Skip to content

Commit fcdccd7

Browse files
authored
GLSP-1067: Ensure proper bundling of workflow editor example (#117)
Update maven build to temporarily remove the .gitignore file for diagram resourced during build. This ensures that tycho properly includes the resources in the workflow editor plugin for the p2 update site. Also fix broken codeql workflow Fixes eclipse-glsp/glsp/issues/1067
1 parent fb352d1 commit fcdccd7

File tree

2 files changed

+40
-2
lines changed

2 files changed

+40
-2
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ jobs:
4040

4141
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
4242
with:
43-
java-version: 17
43+
distribution: 'temurin'
44+
java-version: 17
4445

4546

4647
# Initializes the CodeQL tools for scanning.

server/releng/org.eclipse.glsp.ide.repository/pom.xml

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<profiles>JavaSE-17</profiles>
2222
</configuration>
2323
</plugin>
24-
<!-- Skip cleaning of this module otherwise the release build is not working
24+
<!-- Skip cleaning of this module otherwise the release build is not working
2525
on the jenkins instance -->
2626
<plugin>
2727
<artifactId>maven-clean-plugin</artifactId>
@@ -30,6 +30,43 @@
3030
<skip>true</skip>
3131
</configuration>
3232
</plugin>
33+
<!-- Temporarily remove .gitignore during p2 updatesite build to ensure
34+
gitignored files are included in the repository -->
35+
<plugin>
36+
<groupId>org.apache.maven.plugins</groupId>
37+
<artifactId>maven-antrun-plugin</artifactId>
38+
<version>${maven-antrun-plugin.version}</version>
39+
<executions>
40+
<execution>
41+
<id>remove-gitignore</id>
42+
<phase>initialize</phase>
43+
<goals>
44+
<goal>run</goal>
45+
</goals>
46+
<configuration>
47+
<target>
48+
<move file="${project.basedir}/../../example/org.eclipse.glsp.ide.workflow.editor/diagram/.gitignore"
49+
tofile="${project.basedir}/../../example/org.eclipse.glsp.ide.workflow.editor/diagram/.gitignore.bak"
50+
failonerror="true"/>
51+
</target>
52+
</configuration>
53+
</execution>
54+
<execution>
55+
<id>restore-gitignore</id>
56+
<phase>verify</phase>
57+
<goals>
58+
<goal>run</goal>
59+
</goals>
60+
<configuration>
61+
<target>
62+
<move file="${project.basedir}/../../example/org.eclipse.glsp.ide.workflow.editor/diagram/.gitignore.bak"
63+
tofile="${project.basedir}/../../example/org.eclipse.glsp.ide.workflow.editor/diagram/.gitignore"
64+
failonerror="true"/>
65+
</target>
66+
</configuration>
67+
</execution>
68+
</executions>
69+
</plugin>
3370
</plugins>
3471
</build>
3572

0 commit comments

Comments
 (0)