[taler-wallet-core] branch master updated (8da08fe42 -> 06e76f52e)

[gnunet]

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

devan-carpenter pushed a change to branch master
in repository wallet-core.

    from 8da08fe42 wallet-core: uniform transaction interface, cleanup
     new 579dec5ba ci: move to contrib dir
     new 06e76f52e ci: update local run script

The 2 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:
 ci/ci.sh                                           | 29 ------------------
 {ci => contrib/ci}/Containerfile                   |  0
 contrib/ci/ci.sh                                   | 34 ++++++++++++++++++++++
 {ci => contrib/ci}/jobs/0-codespell/config.ini     |  0
 {ci => contrib/ci}/jobs/0-codespell/dictionary.txt |  0
 {ci => contrib/ci}/jobs/0-codespell/job.sh         |  0
 {ci => contrib/ci}/jobs/1-build/build.sh           |  0
 {ci => contrib/ci}/jobs/1-build/job.sh             |  0
 {ci => contrib/ci}/jobs/2-docs/docs.sh             |  0
 {ci => contrib/ci}/jobs/2-docs/job.sh              |  0
 10 files changed, 34 insertions(+), 29 deletions(-)
 delete mode 100755 ci/ci.sh
 rename {ci => contrib/ci}/Containerfile (100%)
 create mode 100755 contrib/ci/ci.sh
 rename {ci => contrib/ci}/jobs/0-codespell/config.ini (100%)
 rename {ci => contrib/ci}/jobs/0-codespell/dictionary.txt (100%)
 rename {ci => contrib/ci}/jobs/0-codespell/job.sh (100%)
 rename {ci => contrib/ci}/jobs/1-build/build.sh (100%)
 rename {ci => contrib/ci}/jobs/1-build/job.sh (100%)
 rename {ci => contrib/ci}/jobs/2-docs/docs.sh (100%)
 rename {ci => contrib/ci}/jobs/2-docs/job.sh (100%)

diff --git a/ci/ci.sh b/ci/ci.sh
deleted file mode 100755
index fc523d8f5..000000000
--- a/ci/ci.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-set -evuo pipefail
-
-# Use podman if available, otherwise use docker.
-# Fails if neither is found in PATH
-OCI_RUNTIME=$(which podman || which docker)
-REPO_NAME=$(basename "${PWD}")
-JOB_NAME="${1}"
-JOB_CONTAINER=$((grep CONTAINER_NAME ci/jobs/${JOB_NAME}/config.ini | cut -d' 
' -f 3) || echo "${REPO_NAME}")
-
-echo "${JOB_CONTAINER}"
-
-if [ "${JOB_CONTAINER}" = "${REPO_NAME}" ] ; then
-       "${OCI_RUNTIME}" build \
-               -t "${JOB_CONTAINER}" \
-               -f ci/Containerfile .
-fi
-
-"${OCI_RUNTIME}" run \
-       --rm \
-       -ti \
-       --volume "${PWD}":/workdir \
-       --workdir /workdir \
-       "${JOB_CONTAINER}" \
-       ci/jobs/"${JOB_NAME}"/job.sh
-
-top_dir=$(dirname "${BASH_SOURCE[0]}")
-
-#"${top_dir}"/build.sh
diff --git a/ci/Containerfile b/contrib/ci/Containerfile
similarity index 100%
rename from ci/Containerfile
rename to contrib/ci/Containerfile
diff --git a/contrib/ci/ci.sh b/contrib/ci/ci.sh
new file mode 100755
index 000000000..0719015b9
--- /dev/null
+++ b/contrib/ci/ci.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+set -exvuo pipefail
+
+# Requires podman
+# Fails if not found in PATH
+OCI_RUNTIME=$(which podman)
+REPO_NAME=$(basename "${PWD}")
+JOB_NAME="${1}"
+JOB_ARCH=$((grep CONTAINER_ARCH contrib/ci/jobs/${JOB_NAME}/config.ini | cut 
-d' ' -f 3) || echo "${2:-amd64}")
+JOB_CONTAINER=$((grep CONTAINER_NAME contrib/ci/jobs/${JOB_NAME}/config.ini | 
cut -d' ' -f 3) || echo "localhost/${REPO_NAME}:${JOB_ARCH}")
+CONTAINER_BUILD=$((grep CONTAINER_BUILD contrib/ci/jobs/${JOB_NAME}/config.ini 
| cut -d' ' -f 3) || echo "True")
+
+echo "Image name: ${JOB_CONTAINER}"
+
+if [ "${CONTAINER_BUILD}" = "True" ] ; then
+       "${OCI_RUNTIME}" build \
+               --arch "${JOB_ARCH}" \
+               -t "${JOB_CONTAINER}" \
+               -f contrib/ci/Containerfile .
+fi
+
+"${OCI_RUNTIME}" run \
+       --rm \
+       -ti \
+       --arch "${JOB_ARCH}" \
+       --env CI_COMMIT_REF="$(git rev-parse HEAD)" \
+       --volume "${PWD}":/workdir \
+       --workdir /workdir \
+       "${JOB_CONTAINER}" \
+       contrib/ci/jobs/"${JOB_NAME}"/job.sh
+
+top_dir=$(dirname "${BASH_SOURCE[0]}")
+
+#"${top_dir}"/build.sh
diff --git a/ci/jobs/0-codespell/config.ini 
b/contrib/ci/jobs/0-codespell/config.ini
similarity index 100%
rename from ci/jobs/0-codespell/config.ini
rename to contrib/ci/jobs/0-codespell/config.ini
diff --git a/ci/jobs/0-codespell/dictionary.txt 
b/contrib/ci/jobs/0-codespell/dictionary.txt
similarity index 100%
rename from ci/jobs/0-codespell/dictionary.txt
rename to contrib/ci/jobs/0-codespell/dictionary.txt
diff --git a/ci/jobs/0-codespell/job.sh b/contrib/ci/jobs/0-codespell/job.sh
similarity index 100%
rename from ci/jobs/0-codespell/job.sh
rename to contrib/ci/jobs/0-codespell/job.sh
diff --git a/ci/jobs/1-build/build.sh b/contrib/ci/jobs/1-build/build.sh
similarity index 100%
rename from ci/jobs/1-build/build.sh
rename to contrib/ci/jobs/1-build/build.sh
diff --git a/ci/jobs/1-build/job.sh b/contrib/ci/jobs/1-build/job.sh
similarity index 100%
rename from ci/jobs/1-build/job.sh
rename to contrib/ci/jobs/1-build/job.sh
diff --git a/ci/jobs/2-docs/docs.sh b/contrib/ci/jobs/2-docs/docs.sh
similarity index 100%
rename from ci/jobs/2-docs/docs.sh
rename to contrib/ci/jobs/2-docs/docs.sh
diff --git a/ci/jobs/2-docs/job.sh b/contrib/ci/jobs/2-docs/job.sh
similarity index 100%
rename from ci/jobs/2-docs/job.sh
rename to contrib/ci/jobs/2-docs/job.sh

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