[WIP] diagnosing problem with variable substitution

Signed-off-by: David Thompson <[email protected]>
eclipse-jdtls · May 13, 2024 · bd6e113 · bd6e113
1 parent 151832b
commit bd6e113
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/.github/workflows/javac-specific-tests.yml b/.github/workflows/javac-specific-tests.yml
@@ -13,17 +13,10 @@ jobs:
   build-dom-javac:
     runs-on: ubuntu-latest
     steps:
-    - name: Install xmllint
-      shell: bash
-      run: |
-        sudo apt update
-        sudo apt install -y libxml2-utils
     - uses: actions/checkout@v4
       with:
         submodules: recursive
         fetch-depth: 0
-    - name: Enable DOM-first and Javac
-      run: sed -i 's$</argLine>$ -DCompilationUnit.DOM_BASED_OPERATIONS=true -DSourceIndexer.DOM_BASED_INDEXER=false -DICompilationUnitResolver=org.eclipse.jdt.core.dom.JavacCompilationUnitResolver -DAbstractImageBuilder.compiler=org.eclipse.jdt.internal.javac.JavacCompiler_</argLine>$g' */pom.xml
     - name: Set up JDKs ☕
       uses: actions/setup-java@v4
       with:

diff --git a/org.eclipse.jdt.core.tests.javac/pom.xml b/org.eclipse.jdt.core.tests.javac/pom.xml
@@ -44,7 +44,7 @@
 							<includes>
 								<include>org/eclipse/jdt/core/tests/javac/RunConverterTestsJavac.class</include>
 							</includes>
-							<argLine>${tycho.surefire.argLine}</argLine>
+							<argLine>--add-modules ALL-SYSTEM -Dcompliance=21 -DCompilationUnit.DOM_BASED_OPERATIONS=true -DSourceIndexer.DOM_BASED_INDEXER=true --add-opens jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED -DICompilationUnitResolver=org.eclipse.jdt.core.dom.JavacCompilationUnitResolver -DAbstractImageBuilder.compiler=org.eclipse.jdt.internal.javac.JavacCompiler -DASTParser.compilationUnitResolver=org.eclipse.jdt.core.dom.JavacCompilationUnitResolver</argLine>
 						</configuration>
 					</plugin>
 				</plugins>