diff options
| author | Nick Vatamaniuc <vatamane@apache.org> | 2022-12-19 02:50:34 -0500 |
|---|---|---|
| committer | Nick Vatamaniuc <nickva@users.noreply.github.com> | 2022-12-19 12:28:50 -0500 |
| commit | 16807eca2c4f9037ecf577410bf966efc0ceb8c4 (patch) | |
| tree | 26b67e69c1d2e85eb2880c2738cf9a8d6879d965 | |
| parent | 8d4c62ed39f7ea787ee879b9f777302f2dd71699 (diff) | |
| download | couchdb-16807eca2c4f9037ecf577410bf966efc0ceb8c4.tar.gz | |
Return back to allowing offline configure and make release
At some point it broke - it looks like rebar3, erlfmt and python-black
usage ended up needing the network to install/update themselves.
Make sure rebar3 and erlfmt is in bin/ alongside rebar, and make
python-black is in a separate source formatting stage step in CI and
remove it from `make check`.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | Makefile.win | 2 | ||||
| -rw-r--r-- | build-aux/Jenkinsfile.pr | 3 | ||||
| -rwxr-xr-x | build-aux/couchdb-build-release.sh | 2 |
4 files changed, 6 insertions, 3 deletions
@@ -151,7 +151,7 @@ escriptize: couch .PHONY: check # target: check - Test everything -check: all python-black +check: all @$(MAKE) exunit @$(MAKE) eunit @$(MAKE) mango-test diff --git a/Makefile.win b/Makefile.win index 8a8129ff8..a897554e7 100644 --- a/Makefile.win +++ b/Makefile.win @@ -132,7 +132,7 @@ fauxton: share\www .PHONY: check # target: check - Test everything -check: all python-black +check: all @$(MAKE) eunit @$(MAKE) mango-test @$(MAKE) elixir diff --git a/build-aux/Jenkinsfile.pr b/build-aux/Jenkinsfile.pr index f24fed1a8..70b45b586 100644 --- a/build-aux/Jenkinsfile.pr +++ b/build-aux/Jenkinsfile.pr @@ -163,7 +163,7 @@ pipeline { } } // stage Build Docs - stage('Erlfmt') { + stage('Source Format Checks') { when { beforeOptions true expression { ONLY_DOCS_CHANGED == '0' } @@ -185,6 +185,7 @@ pipeline { rm -rf apache-couchdb-* ./configure --skip-deps make erlfmt-check + make python-black ''' } post { diff --git a/build-aux/couchdb-build-release.sh b/build-aux/couchdb-build-release.sh index dfd529d13..10a221ff2 100755 --- a/build-aux/couchdb-build-release.sh +++ b/build-aux/couchdb-build-release.sh @@ -54,3 +54,5 @@ fi # copy our rebar cp bin/rebar ${REL_DIR}/bin/rebar +cp bin/rebar3 ${REL_DIR}/bin/rebar3 +cp bin/erlfmt ${REL_DIR}/bin/erlfmt |