Skip to content

Commit 4d85d7f

Browse files
authored
Merge branch 'main' into update-whats-new-3.4.x
2 parents fee5901 + 6f42f49 commit 4d85d7f

24 files changed

+1496
-1188
lines changed

build-aux/Jenkinsfile.full

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,11 +246,12 @@ def generateNativeStage(platform) {
246246

247247
powershell( script: '.\\..\\..\\couchdb-glazier\\bin\\shell.ps1; Write-Host "NOT AVAILABLE: make -f Makefile.win weatherreport-test"', label: 'N/A Weatherreport tests')
248248

249-
powershell( script: """
250-
.\\..\\..\\couchdb-glazier\\bin\\shell.ps1
251-
Set-Item -Path env:GRADLE_OPTS -Value '-Dorg.gradle.daemon=false'
252-
make -f Makefile.win nouveau-test
253-
""", label: 'Nouveau tests')
249+
// temporary exclude - random flaky tests on Windows
250+
//powershell( script: """
251+
// .\\..\\..\\couchdb-glazier\\bin\\shell.ps1
252+
// Set-Item -Path env:GRADLE_OPTS -Value '-Dorg.gradle.daemon=false'
253+
// make -f Makefile.win nouveau-test
254+
//""", label: 'Nouveau tests')
254255
}
255256

256257
powershell( script: """

rebar.config.script

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,12 +156,12 @@ DepDescs = [
156156

157157
%% %% Non-Erlang deps
158158
{fauxton, {url, "https://github.com/apache/couchdb-fauxton"},
159-
{tag, "v1.3.1"}, [raw]},
159+
{tag, "v1.3.2"}, [raw]},
160160
{ibrowse, "ibrowse", {tag, "CouchDB-4.4.2-6"}},
161161
{jiffy, "jiffy", {tag, "1.1.2"}},
162162
{mochiweb, "mochiweb", {tag, "v3.2.2"}},
163-
{meck, "meck", {tag, "CouchDB-0.9.2-1"}},
164-
{recon, "recon", {tag, "2.5.5"}}
163+
{meck, "meck", {tag, "1.0.0"}},
164+
{recon, "recon", {tag, "2.5.6"}}
165165
].
166166

167167
WithProper = lists:keyfind(with_proper, 1, CouchConfig) == {with_proper, true}.

0 commit comments

Comments
 (0)