[couchdb] branch main updated: Return back to allowing offline configure and make release

[vatamane]

This is an automated email from the ASF dual-hosted git repository.

vatamane pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb.git


The following commit(s) were added to refs/heads/main by this push:
     new 16807eca2 Return back to allowing offline configure and make release
16807eca2 is described below

commit 16807eca2c4f9037ecf577410bf966efc0ceb8c4
Author: Nick Vatamaniuc <vatam...@apache.org>
AuthorDate: Mon Dec 19 02:50:34 2022 -0500

    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`.
---
 Makefile                           | 2 +-
 Makefile.win                       | 2 +-
 build-aux/Jenkinsfile.pr           | 3 ++-
 build-aux/couchdb-build-release.sh | 2 ++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 522acaf39..e9ab1d223 100644
--- a/Makefile
+++ b/Makefile
@@ -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