[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-sandcastle-ng] branch master updated (2f6fe86 -> 230537b)
From: |
gnunet |
Subject: |
[taler-sandcastle-ng] branch master updated (2f6fe86 -> 230537b) |
Date: |
Sun, 18 Feb 2024 18:51:52 +0100 |
This is an automated email from the git hooks/post-receive script.
devan-carpenter pushed a change to branch master
in repository sandcastle-ng.
from 2f6fe86 ci: we need git in the image now
new 4415a21 add a checkout step to the component installation
new 230537b head-ci: fill checkout refs with sha hash of HEAD
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:
Dockerfile | 35 +++++++++++++++++------------
buildconfig/exchange.checkout | 1 +
buildconfig/gnunet.checkout | 1 +
buildconfig/libeufin.checkout | 1 +
buildconfig/merchant-demos.checkout | 1 +
buildconfig/merchant.checkout | 1 +
buildconfig/sync.checkout | 1 +
buildconfig/wallet.checkout | 1 +
contrib/ci/jobs/1-build-head/update-tags.sh | 23 +++++++++++++------
9 files changed, 44 insertions(+), 21 deletions(-)
create mode 120000 buildconfig/exchange.checkout
create mode 120000 buildconfig/gnunet.checkout
create mode 120000 buildconfig/libeufin.checkout
create mode 120000 buildconfig/merchant-demos.checkout
create mode 120000 buildconfig/merchant.checkout
create mode 120000 buildconfig/sync.checkout
create mode 120000 buildconfig/wallet.checkout
diff --git a/Dockerfile b/Dockerfile
index ef26691..029aa8a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -70,11 +70,12 @@ RUN pip3 install --break-system-packages requests click
poetry uwsgi htmlark sph
# GNUnet
FROM base-system AS gnunet
-COPY buildconfig/gnunet.tag /buildconfig/
+COPY buildconfig/gnunet.* /buildconfig/
WORKDIR /build
RUN TAG=$(cat /buildconfig/gnunet.tag) && \
git clone git://git.gnunet.org/gnunet \
- --branch $TAG
+ --branch $TAG && \
+ cd gnunet && git checkout $(cat /buildconfig/gnunet.checkout)
WORKDIR /build/gnunet
RUN ./bootstrap
RUN dpkg-buildpackage -rfakeroot -b -uc -us
@@ -88,11 +89,12 @@ WORKDIR /
# Exchange
FROM gnunet as exchange
-COPY buildconfig/exchange.tag /buildconfig/
+COPY buildconfig/exchange.* /buildconfig/
WORKDIR /build
RUN TAG=$(cat /buildconfig/exchange.tag) && \
git clone git://git.taler.net/exchange \
- --branch $TAG
+ --branch $TAG && \
+ cd exchange && git checkout $(cat /buildconfig/exchange.checkout)
WORKDIR /build/exchange
RUN ./bootstrap
RUN dpkg-buildpackage -rfakeroot -b -uc -us
@@ -106,11 +108,12 @@ WORKDIR /
# Merchant
FROM exchange as merchant
-COPY buildconfig/merchant.tag /buildconfig/
+COPY buildconfig/merchant.* /buildconfig/
WORKDIR /build
RUN TAG=$(cat /buildconfig/merchant.tag) && \
git clone git://git.taler.net/merchant \
- --branch $TAG
+ --branch $TAG && \
+ cd merchant && git checkout $(cat /buildconfig/merchant.checkout)
WORKDIR /build/merchant
RUN ./bootstrap && \
./configure --prefix=/usr \
@@ -127,10 +130,11 @@ WORKDIR /
FROM base-system as libeufin
WORKDIR /build
-COPY buildconfig/libeufin.tag /buildconfig/
+COPY buildconfig/libeufin.* /buildconfig/
RUN TAG=$(cat /buildconfig/libeufin.tag) && \
git clone git://git.taler.net/libeufin \
- --branch $TAG
+ --branch $TAG && \
+ cd libeufin && git checkout $(cat /buildconfig/libeufin.checkout)
WORKDIR /build/libeufin
RUN ./bootstrap
RUN ./configure --prefix=/usr
@@ -145,10 +149,11 @@ RUN apt-get install --no-install-recommends -y
/packages/libeufin/*.deb
FROM base-system as merchant-demos
WORKDIR /build
-COPY buildconfig/merchant-demos.tag /buildconfig/
+COPY buildconfig/merchant-demos.* /buildconfig/
RUN TAG=$(cat /buildconfig/merchant-demos.tag) && \
git clone git://git.taler.net/taler-merchant-demos \
- --branch $TAG
+ --branch $TAG && \
+ cd taler-merchant-demos && git checkout $(cat
/buildconfig/merchant-demos.checkout)
WORKDIR /build/taler-merchant-demos
RUN ./bootstrap
RUN dpkg-buildpackage -rfakeroot -b -uc -us
@@ -161,10 +166,11 @@ RUN apt-get install --no-install-recommends -y
/packages/merchant-demos/*.deb
# wallet-core tools (taler-wallet-cli and taler-harness)
FROM base-system as wallet
WORKDIR /build
-COPY buildconfig/wallet.tag /buildconfig/
+COPY buildconfig/wallet.* /buildconfig/
RUN TAG=$(cat /buildconfig/wallet.tag) && \
git clone git://git.taler.net/wallet-core \
- --branch $TAG
+ --branch $TAG && \
+ cd wallet-core && git checkout $(cat /buildconfig/wallet.checkout)
RUN npm install -g pnpm@^8.7.0
WORKDIR /build/wallet-core
RUN ./bootstrap
@@ -188,11 +194,12 @@ RUN apt-get install --no-install-recommends -y
/packages/wallet/*.deb
# Sync
FROM merchant as sync
-COPY buildconfig/sync.tag /buildconfig/
+COPY buildconfig/sync.* /buildconfig/
WORKDIR /build
RUN TAG=$(cat /buildconfig/sync.tag) && \
git clone git://git.taler.net/sync \
- --branch $TAG
+ --branch $TAG && \
+ cd sync && git checkout $(cat /buildconfig/sync.checkout)
WORKDIR /build/sync
RUN ./bootstrap
RUN dpkg-buildpackage -rfakeroot -b -uc -us
diff --git a/buildconfig/exchange.checkout b/buildconfig/exchange.checkout
new file mode 120000
index 0000000..5bd8bc2
--- /dev/null
+++ b/buildconfig/exchange.checkout
@@ -0,0 +1 @@
+exchange.tag
\ No newline at end of file
diff --git a/buildconfig/gnunet.checkout b/buildconfig/gnunet.checkout
new file mode 120000
index 0000000..307fd43
--- /dev/null
+++ b/buildconfig/gnunet.checkout
@@ -0,0 +1 @@
+gnunet.tag
\ No newline at end of file
diff --git a/buildconfig/libeufin.checkout b/buildconfig/libeufin.checkout
new file mode 120000
index 0000000..13917f1
--- /dev/null
+++ b/buildconfig/libeufin.checkout
@@ -0,0 +1 @@
+libeufin.tag
\ No newline at end of file
diff --git a/buildconfig/merchant-demos.checkout
b/buildconfig/merchant-demos.checkout
new file mode 120000
index 0000000..ae61f5e
--- /dev/null
+++ b/buildconfig/merchant-demos.checkout
@@ -0,0 +1 @@
+merchant-demos.tag
\ No newline at end of file
diff --git a/buildconfig/merchant.checkout b/buildconfig/merchant.checkout
new file mode 120000
index 0000000..91fe5a9
--- /dev/null
+++ b/buildconfig/merchant.checkout
@@ -0,0 +1 @@
+merchant.tag
\ No newline at end of file
diff --git a/buildconfig/sync.checkout b/buildconfig/sync.checkout
new file mode 120000
index 0000000..5da4c10
--- /dev/null
+++ b/buildconfig/sync.checkout
@@ -0,0 +1 @@
+sync.tag
\ No newline at end of file
diff --git a/buildconfig/wallet.checkout b/buildconfig/wallet.checkout
new file mode 120000
index 0000000..52e623e
--- /dev/null
+++ b/buildconfig/wallet.checkout
@@ -0,0 +1 @@
+wallet.tag
\ No newline at end of file
diff --git a/contrib/ci/jobs/1-build-head/update-tags.sh
b/contrib/ci/jobs/1-build-head/update-tags.sh
index 2c7719c..4608fef 100755
--- a/contrib/ci/jobs/1-build-head/update-tags.sh
+++ b/contrib/ci/jobs/1-build-head/update-tags.sh
@@ -13,10 +13,19 @@ MERCHANT_DEMOS_HEAD=$(fetch_head
"git://git.taler.net/taler-merchant-demos")
WALLET_HEAD=$(fetch_head "git://git.taler.net/wallet-core")
SYNC_HEAD=$(fetch_head "git://git.taler.net/sync")
-echo $GNUNET_HEAD > buildconfig/gnunet.tag
-echo $EXCHANGE_HEAD > buildconfig/exchange.tag
-echo $MERCHANT_HEAD > buildconfig/merchant.tag
-echo $LIBEUFIN_HEAD > buildconfig/libeufin.tag
-echo $MERCHANT_DEMOS_HEAD > buildconfig/merchant-demos.tag
-echo $WALLET_HEAD > buildconfig/wallet.tag
-echo $SYNC_HEAD > buildconfig/sync.tag
+echo "master" > buildconfig/gnunet.tag
+echo "master" > buildconfig/exchange.tag
+echo "master" > buildconfig/merchant.tag
+echo "master" > buildconfig/libeufin.tag
+echo "master" > buildconfig/merchant-demos.tag
+echo "master" > buildconfig/wallet.tag
+echo "master" > buildconfig/sync.tag
+
+rm -f buildconfig/*.checkout
+echo $GNUNET_HEAD > buildconfig/gnunet.checkout
+echo $EXCHANGE_HEAD > buildconfig/exchange.checkout
+echo $MERCHANT_HEAD > buildconfig/merchant.checkout
+echo $LIBEUFIN_HEAD > buildconfig/libeufin.checkout
+echo $MERCHANT_DEMOS_HEAD > buildconfig/merchant-demos.checkout
+echo $WALLET_HEAD > buildconfig/wallet.checkout
+echo $SYNC_HEAD > buildconfig/sync.checkout
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-sandcastle-ng] branch master updated (2f6fe86 -> 230537b),
gnunet <=