Skip to content

Commit 4952101

Browse files
committed
test
1 parent d6e96f5 commit 4952101

7 files changed

Lines changed: 11 additions & 214 deletions

File tree

.github/workflows/develop-status.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ jobs:
1515

1616
steps:
1717
- uses: actions/checkout@v4
18+
- name: Register JVM thread dump on cancel
19+
uses: ./.github/actions/thread-dump-post
1820
- name: Set up JDK
1921
uses: actions/setup-java@v1
2022
with:
@@ -29,7 +31,7 @@ jobs:
2931
- name: Build
3032
run: mvn -B -U clean install -Pquick,\!formatting
3133
- name: Verify
32-
run: ./scripts/ci/run-with-thread-dump.sh mvn -B install -P-skipSlowTests -Dmaven.javadoc.skip=true
34+
run: exec ./scripts/ci/run-with-thread-dump.sh mvn -B install -P-skipSlowTests -Dmaven.javadoc.skip=true
3335
- name: Publish Test Report
3436
if: failure()
3537
uses: scacap/action-surefire-report@v1

.github/workflows/main-status.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ jobs:
1515

1616
steps:
1717
- uses: actions/checkout@v4
18+
- name: Register JVM thread dump on cancel
19+
uses: ./.github/actions/thread-dump-post
1820
- name: Set up JDK
1921
uses: actions/setup-java@v1
2022
with:
@@ -29,7 +31,7 @@ jobs:
2931
- name: Build
3032
run: mvn -B -U -T 2C clean install -DskipTests
3133
- name: Run all tests
32-
run: ./scripts/ci/run-with-thread-dump.sh mvn -B install -P-skipSlowTests -Dmaven.javadoc.skip=true
34+
run: exec ./scripts/ci/run-with-thread-dump.sh mvn -B install -P-skipSlowTests -Dmaven.javadoc.skip=true
3335
- name: Publish Test Report
3436
if: failure()
3537
uses: scacap/action-surefire-report@v1

.github/workflows/pr-verify.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ jobs:
2525
distribution: 'temurin'
2626
cache: maven
2727
- name: Check formatting
28-
run: exec ./scripts/ci/run-with-thread-dump.sh mvn -B --quiet -T 2C formatter:validate impsort:check xml-format:xml-check
28+
run: mvn -B --quiet -T 2C formatter:validate impsort:check xml-format:xml-check
2929
- name: Quick compile
30-
run: exec ./scripts/ci/run-with-thread-dump.sh mvn -B --quiet -T 2C compile -DskipTests -Pquick
30+
run: mvn -B --quiet -T 2C compile -DskipTests -Pquick
3131
- name: Download all other dependencies
32-
run: exec ./scripts/ci/run-with-thread-dump.sh mvn -B --quiet -T 2C dependency:go-offline
32+
run: mvn -B --quiet -T 2C dependency:go-offline
3333

3434
compile:
3535
needs: formatting-and-quick-compile

core/common/io/src/test/java/org/eclipse/rdf4j/common/io/CiThreadDumpWorkflowTest.java

Lines changed: 0 additions & 80 deletions
This file was deleted.

pom.xml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
</licenses>
4040
<modules>
4141
<module>assembly-descriptors</module>
42-
<module>test-timeout-agent</module>
4342
<module>core</module>
4443
<module>tools</module>
4544
<module>spring-components</module>
@@ -76,8 +75,6 @@
7675
<junit.version>5.9.3</junit.version>
7776
<jetty.version>9.4.54.v20240208</jetty.version>
7877
<netty.version>4.1.111.Final</netty.version>
79-
<test.timeout.seconds>14401</test.timeout.seconds>
80-
<test.timeout.agent.jar>${maven.multiModuleProjectDirectory}/test-timeout-agent/target/rdf4j-test-timeout-agent-${project.version}.jar</test.timeout.agent.jar>
8178
<testcontainers.version>1.20.6</testcontainers.version>
8279
<argLine/>
8380
</properties>
@@ -845,10 +842,8 @@
845842
<artifactId>maven-surefire-plugin</artifactId>
846843
<version>3.5.4</version>
847844
<configuration>
848-
<forkCount>1</forkCount>
849845
<!-- Prepend JaCoCo agent args when profile 'jacoco' sets @{argLine} -->
850-
<argLine>@{argLine} -Xmx4G -javaagent:"${test.timeout.agent.jar}"=${test.timeout.seconds}</argLine>
851-
<forkedProcessTimeoutInSeconds>${test.timeout.seconds}</forkedProcessTimeoutInSeconds>
846+
<argLine>@{argLine} -Xmx4G</argLine>
852847
</configuration>
853848
</plugin>
854849
<plugin>
@@ -859,8 +854,7 @@
859854
<forkCount>1</forkCount>
860855
<reuseForks>false</reuseForks>
861856
<!-- Prepend JaCoCo agent args when profile 'jacoco' sets @{argLine} -->
862-
<argLine>@{argLine} -Xmx4G -javaagent:"${test.timeout.agent.jar}"=${test.timeout.seconds}</argLine>
863-
<forkedProcessTimeoutInSeconds>${test.timeout.seconds}</forkedProcessTimeoutInSeconds>
857+
<argLine>@{argLine} -Xmx4G</argLine>
864858
<includes>
865859
<include>**/*IT.java</include>
866860
</includes>

test-timeout-agent/pom.xml

Lines changed: 0 additions & 27 deletions
This file was deleted.

test-timeout-agent/src/main/java/org/eclipse/rdf4j/build/TestTimeoutAgent.java

Lines changed: 0 additions & 94 deletions
This file was deleted.

0 commit comments

Comments
 (0)