[gnunet] branch master updated (1c0df659e -> 9dd915b5a)

[gnunet]

This is an automated email from the git hooks/post-receive script.

dvn pushed a change to branch master
in repository gnunet.

    from 1c0df659e PEERSTORE: Actually return error core in API
     new ee0c0b198 ci: add arm64 package build and deploy
     new 5e380c9f3 ci: clean the workspace before building for arm64
     new d11add3f5 ci: fix more old paths from migration to contrib
     new 9dd915b5a ci: update version script to work on detached head

The 4 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.


Summary of changes:
 contrib/ci/jobs/2-deb-package/job.sh                  |  2 +-
 contrib/ci/jobs/2-deb-package/version.sh              | 19 ++++++++++++-------
 contrib/ci/jobs/{0-build => 4-arm64-build}/build.sh   |  1 +
 contrib/ci/jobs/4-arm64-build/config.ini              |  6 ++++++
 contrib/ci/jobs/{0-build => 4-arm64-build}/job.sh     |  0
 contrib/ci/jobs/5-arm64-deb-package/config.ini        |  6 ++++++
 .../{2-deb-package => 5-arm64-deb-package}/job.sh     |  2 +-
 contrib/ci/jobs/5-arm64-deb-package/version.sh        | 17 +++++++++++++++++
 .../config.ini                                        |  2 +-
 .../job.sh                                            |  0
 10 files changed, 45 insertions(+), 10 deletions(-)
 copy contrib/ci/jobs/{0-build => 4-arm64-build}/build.sh (93%)
 create mode 100644 contrib/ci/jobs/4-arm64-build/config.ini
 copy contrib/ci/jobs/{0-build => 4-arm64-build}/job.sh (100%)
 create mode 100644 contrib/ci/jobs/5-arm64-deb-package/config.ini
 copy contrib/ci/jobs/{2-deb-package => 5-arm64-deb-package}/job.sh (91%)
 create mode 100755 contrib/ci/jobs/5-arm64-deb-package/version.sh
 copy contrib/ci/jobs/{3-deploy-package => 6-arm64-deploy-package}/config.ini 
(83%)
 copy contrib/ci/jobs/{3-deploy-package => 6-arm64-deploy-package}/job.sh (100%)

diff --git a/contrib/ci/jobs/2-deb-package/job.sh 
b/contrib/ci/jobs/2-deb-package/job.sh
index fc1f114f4..00ded9323 100755
--- a/contrib/ci/jobs/2-deb-package/job.sh
+++ b/contrib/ci/jobs/2-deb-package/job.sh
@@ -11,7 +11,7 @@ unset LD_LIBRARY_PATH
 apt-get update
 mk-build-deps --install --tool='apt-get -o Debug::pkgProblemResolver=yes 
--no-install-recommends --yes' debian/control
 
-export VERSION="$(./ci/jobs/2-deb-package/version.sh)"
+export VERSION="$(./contrib/ci/jobs/2-deb-package/version.sh)"
 echo "Building gnunet packages version ${VERSION}"
 EMAIL=none gbp dch --ignore-branch --debian-tag="%(version)s" --git-author 
--new-version="${VERSION}"
 ./bootstrap
diff --git a/contrib/ci/jobs/2-deb-package/version.sh 
b/contrib/ci/jobs/2-deb-package/version.sh
index 74d0099a2..c5b4e395a 100755
--- a/contrib/ci/jobs/2-deb-package/version.sh
+++ b/contrib/ci/jobs/2-deb-package/version.sh
@@ -1,12 +1,17 @@
 #!/bin/sh
 set -ex
 
-git fetch origin $(git rev-parse --abbrev-ref HEAD) --depth=1000 --tags
-RECENT_VERSION_TAG=$(git describe --tags --match 'v*.*.*' --always --abbrev=0 
HEAD)
-
-commits="$(git rev-list ${RECENT_VERSION_TAG}..HEAD --count)"
-if [ "${commits}" = "0" ]; then
-    git describe --tag HEAD
+BRANCH=$(git name-rev --name-only HEAD)
+if [ -z "${BRANCH}" ]; then
+       exit 1
 else
-    echo $(echo ${RECENT_VERSION_TAG} | cut -d'v' -f2)-${commits}-$(git 
rev-parse --short=8 HEAD)
+        # "Unshallow" our checkout, but only our current branch, and exclude 
the submodules.
+       git fetch --no-recurse-submodules --tags --depth=1000 origin "${BRANCH}"
+       RECENT_VERSION_TAG=$(git describe --tags --match 'v*.*.*' --always 
--abbrev=0 HEAD)
+       commits="$(git rev-list ${RECENT_VERSION_TAG}..HEAD --count)"
+       if [ "${commits}" = "0" ]; then
+               git describe --tag HEAD
+       else
+               echo $(echo ${RECENT_VERSION_TAG} | sed -r 
's/^v//')-${commits}-$(git rev-parse --short=8 HEAD)
+       fi
 fi
diff --git a/contrib/ci/jobs/0-build/build.sh 
b/contrib/ci/jobs/4-arm64-build/build.sh
similarity index 93%
copy from contrib/ci/jobs/0-build/build.sh
copy to contrib/ci/jobs/4-arm64-build/build.sh
index a5a89ca82..7da9d4a75 100755
--- a/contrib/ci/jobs/0-build/build.sh
+++ b/contrib/ci/jobs/4-arm64-build/build.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 set -exuo pipefail
 
+make clean
 ./bootstrap
 ./configure CFLAGS="-ggdb -O0" \
            --enable-logging=verbose \
diff --git a/contrib/ci/jobs/4-arm64-build/config.ini 
b/contrib/ci/jobs/4-arm64-build/config.ini
new file mode 100644
index 000000000..b5b4b5fe7
--- /dev/null
+++ b/contrib/ci/jobs/4-arm64-build/config.ini
@@ -0,0 +1,6 @@
+[build]
+HALT_ON_FAILURE = True
+WARN_ON_FAILURE = True
+CONTAINER_BUILD = True
+CONTAINER_NAME = gnunet:arm64
+CONTAINER_ARCH = arm64
diff --git a/contrib/ci/jobs/0-build/job.sh 
b/contrib/ci/jobs/4-arm64-build/job.sh
similarity index 100%
copy from contrib/ci/jobs/0-build/job.sh
copy to contrib/ci/jobs/4-arm64-build/job.sh
diff --git a/contrib/ci/jobs/5-arm64-deb-package/config.ini 
b/contrib/ci/jobs/5-arm64-deb-package/config.ini
new file mode 100644
index 000000000..b5b4b5fe7
--- /dev/null
+++ b/contrib/ci/jobs/5-arm64-deb-package/config.ini
@@ -0,0 +1,6 @@
+[build]
+HALT_ON_FAILURE = True
+WARN_ON_FAILURE = True
+CONTAINER_BUILD = True
+CONTAINER_NAME = gnunet:arm64
+CONTAINER_ARCH = arm64
diff --git a/contrib/ci/jobs/2-deb-package/job.sh 
b/contrib/ci/jobs/5-arm64-deb-package/job.sh
similarity index 91%
copy from contrib/ci/jobs/2-deb-package/job.sh
copy to contrib/ci/jobs/5-arm64-deb-package/job.sh
index fc1f114f4..00ded9323 100755
--- a/contrib/ci/jobs/2-deb-package/job.sh
+++ b/contrib/ci/jobs/5-arm64-deb-package/job.sh
@@ -11,7 +11,7 @@ unset LD_LIBRARY_PATH
 apt-get update
 mk-build-deps --install --tool='apt-get -o Debug::pkgProblemResolver=yes 
--no-install-recommends --yes' debian/control
 
-export VERSION="$(./ci/jobs/2-deb-package/version.sh)"
+export VERSION="$(./contrib/ci/jobs/2-deb-package/version.sh)"
 echo "Building gnunet packages version ${VERSION}"
 EMAIL=none gbp dch --ignore-branch --debian-tag="%(version)s" --git-author 
--new-version="${VERSION}"
 ./bootstrap
diff --git a/contrib/ci/jobs/5-arm64-deb-package/version.sh 
b/contrib/ci/jobs/5-arm64-deb-package/version.sh
new file mode 100755
index 000000000..c5b4e395a
--- /dev/null
+++ b/contrib/ci/jobs/5-arm64-deb-package/version.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+set -ex
+
+BRANCH=$(git name-rev --name-only HEAD)
+if [ -z "${BRANCH}" ]; then
+       exit 1
+else
+        # "Unshallow" our checkout, but only our current branch, and exclude 
the submodules.
+       git fetch --no-recurse-submodules --tags --depth=1000 origin "${BRANCH}"
+       RECENT_VERSION_TAG=$(git describe --tags --match 'v*.*.*' --always 
--abbrev=0 HEAD)
+       commits="$(git rev-list ${RECENT_VERSION_TAG}..HEAD --count)"
+       if [ "${commits}" = "0" ]; then
+               git describe --tag HEAD
+       else
+               echo $(echo ${RECENT_VERSION_TAG} | sed -r 
's/^v//')-${commits}-$(git rev-parse --short=8 HEAD)
+       fi
+fi
diff --git a/contrib/ci/jobs/3-deploy-package/config.ini 
b/contrib/ci/jobs/6-arm64-deploy-package/config.ini
similarity index 83%
copy from contrib/ci/jobs/3-deploy-package/config.ini
copy to contrib/ci/jobs/6-arm64-deploy-package/config.ini
index 08c106f9c..a8ad1c16d 100644
--- a/contrib/ci/jobs/3-deploy-package/config.ini
+++ b/contrib/ci/jobs/6-arm64-deploy-package/config.ini
@@ -3,4 +3,4 @@ HALT_ON_FAILURE = True
 WARN_ON_FAILURE = True
 CONTAINER_BUILD = False
 CONTAINER_NAME = nixery.dev/shell/rsync
-CONTAINER_ARCH = amd64
+CONTAINER_ARCH = arm64
diff --git a/contrib/ci/jobs/3-deploy-package/job.sh 
b/contrib/ci/jobs/6-arm64-deploy-package/job.sh
similarity index 100%
copy from contrib/ci/jobs/3-deploy-package/job.sh
copy to contrib/ci/jobs/6-arm64-deploy-package/job.sh

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.