You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by va...@apache.org on 2023/07/24 22:13:50 UTC
[couchdb] branch jenkins-full-ci-try-reverting-windows-nouveau created (now a2367e474)
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a change to branch jenkins-full-ci-try-reverting-windows-nouveau
in repository https://gitbox.apache.org/repos/asf/couchdb.git
at a2367e474 [WIP] This is a test to seee if it's why the full CI fails
This branch includes the following new commits:
new a2367e474 [WIP] This is a test to seee if it's why the full CI fails
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[couchdb] 01/01: [WIP] This is a test to seee if it's why the full CI fails
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch jenkins-full-ci-try-reverting-windows-nouveau
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit a2367e474e577008f6e7ee276a24bb88cf95a449
Author: Nick Vatamaniuc <va...@gmail.com>
AuthorDate: Mon Jul 24 18:12:19 2023 -0400
[WIP] This is a test to seee if it's why the full CI fails
Revert "Build Nouveau on Windows (#4678)"
This reverts commit 1c9dbdb14bf6520abb715fb9d248783b15873245.
---
Makefile.win | 50 ++------------------------------------------------
configure.ps1 | 7 +------
nouveau/.gitattributes | 1 -
nouveau/.gitignore | 1 -
4 files changed, 3 insertions(+), 56 deletions(-)
diff --git a/Makefile.win b/Makefile.win
index 4c8cb6f04..2118508dc 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -98,7 +98,7 @@ TEST_OPTS=-c startup_jitter=0 -c default_security=admin_local
.PHONY: all
# target: all - Build everything
-all: couch fauxton docs nouveau
+all: couch fauxton docs
.PHONY: help
@@ -140,11 +140,9 @@ fauxton: share\www
.PHONY: check
# target: check - Test everything
check: all
- @$(MAKE) exunit
@$(MAKE) eunit
@$(MAKE) mango-test
@$(MAKE) elixir-suite
- @$(MAKE) nouveau-test
ifdef apps
subdirs = $(apps)
@@ -272,10 +270,6 @@ elixir-source-checks: elixir-init
# target: build-report - Generate a build report
build-report:
@$(PYTHON) build-aux/show-test-results.py --suites=10 --tests=10 > test-results.log
- cat .\dev\logs\node1.log || true
- cat .\dev\logs\nouveau.log || true
- cat .\tmp\couch.log || true
- cat test-results.log || true
.PHONY: check-qs
# target: check-qs - Run query server tests (ruby and rspec required!)
@@ -389,12 +383,6 @@ else
endif
endif
-ifeq ($(with_nouveau), 1)
- -@mkdir -p rel\couchdb\nouveau
- @cp nouveau\build\libs\server-*-dist.jar rel\couchdb\nouveau
- @cp nouveau\nouveau.yaml rel\couchdb\nouveau
-endif
-
@echo ... done
@echo .
@echo You can now copy the rel\couchdb directory anywhere on your system.
@@ -435,9 +423,7 @@ clean:
-@rmdir /s/q src\mango\.venv
-@del /f/q src\couch\priv\couch_js\config.h
-@del /f/q dev\boot_node.beam dev\pbkdf2.pyc log\crash.log
-ifeq ($(with_nouveau), 1)
- @cd nouveau && .\gradlew clean
-endif
+
.PHONY: distclean
# target: distclean - Remove build and release artifacts
@@ -503,35 +489,3 @@ derived:
@echo "ON_TAG: $(ON_TAG)"
@echo "REL_TAG: $(REL_TAG)"
@echo "SUB_VSN: $(SUB_VSN)"
-
-
-################################################################################
-# Nouveau
-################################################################################
-
-.PHONY: nouveau
-# target: nouveau - Build nouveau
-nouveau:
-ifeq ($(with_nouveau), 1)
- @cd nouveau && .\gradlew build -x test
-endif
-
-.PHONY: nouveau-test
-# target: nouveau-test - Run nouveau tests
-nouveau-test: nouveau-test-gradle nouveau-test-elixir
-
-.PHONY: nouveau-test-gradle
-nouveau-test-gradle: couch nouveau
-ifeq ($(with_nouveau), 1)
- @cd nouveau && .\gradlew test
-endif
-
-.PHONY: nouveau-test-elixir
-nouveau-test-elixir: export MIX_ENV=integration
-nouveau-test-elixir: elixir-init devclean
-nouveau-test-elixir: couch nouveau
-ifeq ($(with_nouveau), 1)
- @dev\run -n 1 -q -a adm:pass --with-nouveau \
- --locald-config test/elixir/test/config/test-config.ini \
- --no-eval 'mix test --trace --include test/elixir/test/config/nouveau.elixir'
-endif
diff --git a/configure.ps1 b/configure.ps1
index ec0b650db..576430e4e 100644
--- a/configure.ps1
+++ b/configure.ps1
@@ -7,7 +7,6 @@
-DisableFauxton request build process skip building Fauxton (default false)
-DisableDocs request build process skip building documentation (default false)
- -EnableNouveau enable the new experiemtal search module (default false)
-SkipDeps do not update Erlang dependencies (default false)
-CouchDBUser USER set the username to run as (defaults to current user)
-SpiderMonkeyVersion VSN select the version of SpiderMonkey to use (default 91)
@@ -44,7 +43,6 @@ Param(
[switch]$Test = $false,
[switch]$DisableFauxton = $false, # do not build Fauxton
[switch]$DisableDocs = $false, # do not build any documentation or manpages
- [switch]$EnableNouveau = $false, # dont use new search module by default
[switch]$SkipDeps = $false, # do not update erlang dependencies
[switch]$DisableProper = $false, # a compilation pragma. proper is a kind of automated test suite
[switch]$EnableErlangMD5 = $false, # don't use Erlang for md5 hash operations by default
@@ -129,7 +127,6 @@ $InstallDir="$LibDir\couchdb"
$LogFile="$LogDir\couch.log"
$BuildFauxton = [int](-not $DisableFauxton)
$BuildDocs = [int](-not $DisableDocs)
-$BuildNouveau = $(If ($EnableNouveau) {1} else {0})
$Hostname = [System.Net.Dns]::GetHostEntry([string]"localhost").HostName
$WithProper = (-not $DisableProper).ToString().ToLower()
$ErlangMD5 = ($EnableErlangMD5).ToString().ToLower()
@@ -154,12 +151,11 @@ $CouchDBConfig = @"
{prefix, "."}.
{data_dir, "./data"}.
{view_index_dir, "./data"}.
-{state_dir, "./data"}.
{log_file, ""}.
{fauxton_root, "./share/www"}.
{user, "$CouchDBUser"}.
{spidermonkey_version, "$SpiderMonkeyVersion"}.
-{node_name, "-name couchdb@127.0.0.1"}.
+{node_name, "-name couchdb@localhost"}.
{cluster_port, 5984}.
{backend_port, 5986}.
{prometheus_port, 17986}.
@@ -200,7 +196,6 @@ man_dir = $ManDir
with_fauxton = $BuildFauxton
with_docs = $BuildDocs
-with_nouveau = $BuildNouveau
user = $CouchDBUser
spidermonkey_version = $SpiderMonkeyVersion
diff --git a/nouveau/.gitattributes b/nouveau/.gitattributes
deleted file mode 100644
index fcadb2cf9..000000000
--- a/nouveau/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-* text eol=lf
diff --git a/nouveau/.gitignore b/nouveau/.gitignore
index 4e61cb625..a402faa89 100644
--- a/nouveau/.gitignore
+++ b/nouveau/.gitignore
@@ -5,4 +5,3 @@
.vscode/
.gradle/
build/
-target/