diff options
| author | Joan Touzet <wohali@users.noreply.github.com> | 2020-04-30 12:39:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-30 12:39:31 -0400 |
| commit | 209c3957a445296c3f0f0977c0dcbe3747c66d08 (patch) | |
| tree | 3b192a7764eca6fe71c1444077aab79acb2736e7 | |
| parent | 5db8bfeac16d313947e3994693fbcf698a843603 (diff) | |
| parent | f5b46be54d52479d4248b39caee73dbc3248ca31 (diff) | |
| download | couchdb-209c3957a445296c3f0f0977c0dcbe3747c66d08.tar.gz | |
Merge pull request #2854 from apache/3.x-backports-verbump
3.x backports verbump
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | Makefile.win | 7 | ||||
| -rw-r--r-- | rel/reltool.config | 2 | ||||
| -rw-r--r-- | version.mk | 2 |
4 files changed, 9 insertions, 6 deletions
@@ -260,7 +260,9 @@ elixir-credo: elixir-init .PHONY: javascript # target: javascript - Run JavaScript test suites or specific ones defined by suites option javascript: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1 -javascript: devclean +javascript: + + @$(MAKE) devclean @mkdir -p share/www/script/test ifeq ($(IN_RELEASE), true) @cp test/javascript/tests/lorem*.txt share/www/script/test/ diff --git a/Makefile.win b/Makefile.win index 70300893d..700e7b110 100644 --- a/Makefile.win +++ b/Makefile.win @@ -186,7 +186,7 @@ python-black: .venv/bin/black @python.exe -c "import sys; exit(1 if sys.version_info >= (3,6) else 0)" || \ .venv\Scripts\black.exe --check \ --exclude="build/|buck-out/|dist/|_build/|\.git/|\.hg/|\.mypy_cache/|\.nox/|\.tox/|\.venv/|src/rebar/pr2relnotes.py|src/fauxton" \ - build-aux\*.py dev\run test\javascript\run src\mango\test\*.py src\docs\src\conf.py src\docs\ext\*.py . + build-aux dev\run test\javascript\run src\mango\test src\docs\src\conf.py src\docs\ext . python-black-update: .venv/bin/black @python.exe -c "import sys; exit(1 if sys.version_info < (3,6) else 0)" || \ @@ -194,7 +194,7 @@ python-black-update: .venv/bin/black @python.exe -c "import sys; exit(1 if sys.version_info >= (3,6) else 0)" || \ .venv\Scripts\black.exe \ --exclude="build/|buck-out/|dist/|_build/|\.git/|\.hg/|\.mypy_cache/|\.nox/|\.tox/|\.venv/|src/rebar/pr2relnotes.py|src/fauxton" \ - build-aux\*.py dev\run test\javascript\run src\mango\test\*.py src\docs\src\conf.py src\docs\ext\*.py . + build-aux dev\run test\javascript\run src\mango\test src\docs\src\conf.py src\docs\ext . .PHONY: elixir elixir: export MIX_ENV=integration @@ -235,7 +235,8 @@ elixir-credo: elixir-init .PHONY: javascript # target: javascript - Run JavaScript test suites or specific ones defined by suites option javascript: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1 -javascript: devclean +javascript: + @$(MAKE) devclean -@mkdir share\www\script\test ifeq ($(IN_RELEASE), true) @copy test\javascript\tests\lorem*.txt share\www\script\test diff --git a/rel/reltool.config b/rel/reltool.config index 6acba378b..2c3b0e4d0 100644 --- a/rel/reltool.config +++ b/rel/reltool.config @@ -12,7 +12,7 @@ {sys, [ {lib_dirs, ["../src"]}, - {rel, "couchdb", "3.0.0", [ + {rel, "couchdb", "3.1.0", [ %% stdlib asn1, compiler, diff --git a/version.mk b/version.mk index 9ca09ab11..f45495312 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ vsn_major=3 -vsn_minor=0 +vsn_minor=1 vsn_patch=0 |