Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,14 @@ jobs:
# Run pmd:pmd and pmd:cpd first to generate reports for all modules, then run pmd:check and pmd:cpd-check
# This ensures all violations are collected and reported before the build fails
run: xvfb-run mvn clean verify checkstyle:check pmd:pmd pmd:cpd pmd:check pmd:cpd-check spotbugs:check -f ./ddk-parent/pom.xml --batch-mode --fail-at-end
- name: Fail on missing surefire reports
# Tycho-Surefire writes no TEST-*.xml when discovery is empty — fail the job in that case.
if: always()
run: |
if ! find . -path '*/target/surefire-reports/TEST-*.xml' -print -quit | grep -q .; then
echo "::error::No surefire reports found. Test discovery is likely broken."
exit 1
fi
- name: Archive Tycho Surefire Plugin
if: ${{ failure() }}
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.xtext.builder.impl.BuildScheduler;
import org.eclipse.xtext.builder.impl.IBuildFlag;
import org.eclipse.xtext.testing.InjectWith;
import org.eclipse.xtext.testing.extensions.InjectionExtension;
import org.junit.jupiter.api.BeforeEach;
Expand Down Expand Up @@ -60,7 +59,7 @@ public void testTriggerRespectsAutoBuilding() {
// auto-build disabled
when(workspace.isAutoBuilding()).thenReturn(false);
buildTrigger.scheduleFullBuild();
verify(scheduler, never()).scheduleBuildIfNecessary(ArgumentMatchers.<Iterable<IProject>> any(), ArgumentMatchers.<IBuildFlag> any());
verify(scheduler, never()).scheduleBuildIfNecessary(ArgumentMatchers.<Iterable<IProject>> any());

reset(workspace);
reset(scheduler);
Expand All @@ -72,6 +71,6 @@ public void testTriggerRespectsAutoBuilding() {
when(workspace.getRoot()).thenReturn(root);
when(root.getProjects()).thenReturn(projects);
buildTrigger.scheduleFullBuild();
verify(scheduler).scheduleBuildIfNecessary(eq(Arrays.asList(projects)), ArgumentMatchers.<IBuildFlag[]> any());
verify(scheduler).scheduleBuildIfNecessary(eq(Arrays.asList(projects)));
}
}
40 changes: 20 additions & 20 deletions ddk-target/ddk.target
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="DDK Target" sequenceNumber="26">
<target name="DDK Target" sequenceNumber="27">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
Expand All @@ -20,10 +20,6 @@
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.39.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2022-12/202212071000/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtend" version="0.0.0"/>
<unit id="org.eclipse.xtend.typesystem.emf" version="0.0.0"/>
Expand All @@ -46,23 +42,27 @@
<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.39.0"/>
<unit id="net.bytebuddy.byte-buddy" version="1.18.5"/>
<unit id="org.objenesis" version="3.5.0"/>
<unit id="org.mockito.mockito-core" version="5.21.0"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.37.0"/>
<unit id="net.bytebuddy.byte-buddy" version="1.17.7"/>
<unit id="org.objenesis" version="3.4.0"/>
<unit id="org.mockito.mockito-core" version="5.19.0"/>
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.apache.commons.logging" version="1.2.0"/>
<unit id="org.apache.commons.text" version="1.15.0"/>
<unit id="org.junit" version=" 4.13.2.v20240929-1000"/>
<unit id="org.apache.commons.lang3" version="3.20.0"/>
<unit id="org.apache.logging.log4j.core" version="2.25.3"/>
<unit id="org.apache.logging.log4j.api" version="2.25.3"/>
<unit id="org.apache.log4j" version="1.2.26"/> <!--use reload4j 1.2.26 for org.eclipse.xtext dependencies to log4j-->
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/release/4.39.0"/>
<unit id="junit-jupiter-api" version="5.14.3"/>
<unit id="junit-vintage-engine" version="5.14.3"/>
<unit id="org.apache.commons.text" version="1.14.0"/>
<unit id="org.junit" version="4.13.2.v20240929-1000"/>
<unit id="org.apache.commons.lang3" version="3.18.0"/>
<unit id="org.apache.logging.log4j.core" version="2.25.1"/>
<unit id="org.apache.logging.log4j.api" version="2.25.1"/>
<unit id="org.apache.log4j" version="1.2.26"/> <!--use reload4j 1.2.26 for org.eclipse.xtext dependencies to log4j-->
<unit id="junit-jupiter-api" version="5.13.4"/>
<unit id="junit-jupiter-engine" version="5.13.4"/>
<unit id="junit-jupiter-params" version="5.13.4"/>
<unit id="junit-vintage-engine" version="5.13.4"/>
<unit id="junit-platform-commons" version="1.13.4"/>
<unit id="junit-platform-engine" version="1.13.4"/>
<unit id="junit-platform-launcher" version="1.13.4"/>
<unit id="junit-platform-suite-api" version="1.13.4"/>
<unit id="junit-platform-suite-engine" version="1.13.4"/>
</location>
</locations>
</target>