Skip to content

Commit 38ab96e

Browse files
authored
Merge pull request #5513 from evolvedbinary/6.x.x/hotfix/ci-windows-stream-corruption
[6.x.x] Fix CI Windows stream corruption
2 parents 8497da1 + 46258ed commit 38ab96e

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

.github/workflows/ci-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on: [push, pull_request]
33
permissions:
44
contents: read
55
env:
6-
MAVEN_OPTS: -XX:StartFlightRecording=maxsize=5g,disk=true,dumponexit=true,settings=default,filename=./ -DtrimStackTrace=false -D'maven.resolver.transport=wagon'
6+
MAVEN_OPTS: -DtrimStackTrace=false -D'maven.resolver.transport=wagon'
77
DEV_JDK: '8'
88
jobs:
99
license:
@@ -20,6 +20,7 @@ jobs:
2020
timeout-minutes: 60
2121
dependencies:
2222
name: Dependency checks
23+
if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/develop' }}
2324
runs-on: ubuntu-latest
2425
steps:
2526
- uses: actions/checkout@v4
@@ -66,7 +67,7 @@ jobs:
6667
if: ${{ matrix.os == 'ubuntu-latest' }}
6768
run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -V -B -q -T 1C install javadoc:javadoc -DskipTests -D'dependency-check.skip' -D'license.skip' --projects '!exist-distribution,!exist-installer' --also-make
6869
- name: Maven Code Coverage (Develop branch on Linux only)
69-
if: ${{ github.ref == 'refs/heads/develop' && matrix.os == 'ubuntu-latest' }}
70+
if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/develop' && matrix.os == 'ubuntu-latest' }}
7071
env:
7172
CI_NAME: github
7273
BRANCH_NAME_OR_REF: ${{ github.head_ref || github.ref }}
@@ -81,6 +82,5 @@ jobs:
8182
name: ${{ runner.os }}-build-logs
8283
retention-days: 5
8384
path: |
84-
**/*.jfr
8585
**/hs_err_pid*.log
8686
**/target/surefire-reports/*

exist-core/pom.xml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1133,18 +1133,17 @@ The BaseX Team. The original license statement is also included below.]]></pream
11331133
<profiles>
11341134
<profile>
11351135
<!--
1136-
Disable parallel tests on Windows.
1137-
When running multiple tests in parallel, Quartz seems to stop eXist-db from shutting down
1138-
on AppVeyor Windows CI, see: https://github.com/quartz-scheduler/quartz/issues/448
1136+
Disable parallel tests on Windows in CI, seems to cause an occasional issue with
1137+
Surefire that produces the Maven error: 'Corrupted channel by directly writing to native stream in forked JVM'.
11391138
-->
1140-
<id>windows-disable-parallel-testing</id>
1139+
<id>windows-disable-parallel-ci-testing</id>
11411140
<activation>
11421141
<os>
11431142
<family>windows</family>
11441143
</os>
11451144
<property>
1146-
<name>env.APPVEYOR</name>
1147-
<value>True</value>
1145+
<name>env.GITHUB_ACTIONS</name>
1146+
<value>true</value>
11481147
</property>
11491148
</activation>
11501149
<build>
@@ -1173,16 +1172,16 @@ The BaseX Team. The original license statement is also included below.]]></pream
11731172
<forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory" />
11741173
<forkCount>1C</forkCount>
11751174
<reuseForks>false</reuseForks>
1176-
<argLine>-Dfile.encoding=${project.build.sourceEncoding}</argLine>
1175+
<argLine>-Dfile.encoding=${project.build.sourceEncoding} -Dexist.recovery.progressbar.hide=true</argLine>
11771176
<systemPropertyVariables>
11781177
<jetty.home>${project.basedir}/../exist-jetty-config/target/classes/org/exist/jetty</jetty.home>
11791178
<exist.configurationFile>${project.build.testOutputDirectory}/conf.xml</exist.configurationFile>
11801179
<exist.jetty.standalone.webapp.dir>${project.build.testOutputDirectory}/standalone-webapp</exist.jetty.standalone.webapp.dir>
11811180
<log4j.configurationFile>${project.build.testOutputDirectory}/log4j2.xml</log4j.configurationFile>
11821181
</systemPropertyVariables>
11831182
<excludes>
1184-
<!-- NOTE: this test fails on AppVeyor Windows CI with Oracle JDK 11,
1185-
but not on some other windows systems :-/ -->
1183+
<!-- NOTE: this test occasionally fails on Windows CI
1184+
but not on some other Windows systems :-/ -->
11861185
<exclude>org.exist.storage.lock.CollectionLocksTest</exclude>
11871186

11881187
<!-- NOTE: these can still exhibit deadlocks -->

exist-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@
778778
However it can make it hard to diagnose problems if tests leak state; If you experience
779779
such a problem you may want to set it to `false` whilst debugging -->
780780
<reuseForks>true</reuseForks>
781-
<argLine>@{jacocoArgLine} -XX:+IgnoreUnrecognizedVMOptions --illegal-access=debug --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.ref=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED -XX:StartFlightRecording=maxsize=5g,disk=true,dumponexit=true,settings=default,filename=${project.build.directory}/ -Dfile.encoding=${project.build.sourceEncoding}</argLine>
781+
<argLine>@{jacocoArgLine} -XX:+IgnoreUnrecognizedVMOptions --illegal-access=debug --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.ref=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED -Dfile.encoding=${project.build.sourceEncoding}</argLine>
782782
<systemPropertyVariables>
783783
<user.country>UK</user.country>
784784
<user.language>en</user.language>

0 commit comments

Comments
 (0)