commit c441778e3c79400d66b17be869252b7028e78d24
parent ac9f7a928eb4189665c6bfe656ea10b3ecf07ac3
Author: Iván Ávalos <avalos@disroot.org>
Date: Fri, 28 Jun 2024 10:12:54 -0600
[ci] More improvements to pipeline
Diffstat:
7 files changed, 57 insertions(+), 14 deletions(-)
diff --git a/contrib/ci/Containerfile b/contrib/ci/Containerfile
@@ -1,5 +1,13 @@
FROM docker.io/briar/ci-image-android:latest
+# Install fdroidserver and other tools
+RUN apt update && apt-get -qy install --no-install-recommends \
+ python3-pip \
+ openssh-client \
+ rsync
+RUN python3 -m pip install --upgrade pip wheel setuptools
+RUN python3 -m pip install git+https://gitlab.com/fdroid/fdroidserver.git
+
ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk-amd64
# Deployment to F-droid nightly
@@ -9,15 +17,8 @@ ENV NIGHTLY_KEYSTORE_ALIAS androiddebugkey
ENV NIGHTLY_KEYSTORE_PASS android
# Deployment to taler.net/files
-ENV SCP_SSH_KEY /inputs/wallet.taler.net
-ENV SCP_DEST avalos@gv.taler.net:/var/www/files
-
-# Install fdroidserver and other tools
-RUN apt update && apt-get -qy install --no-install-recommends \
- python3-pip \
- openssh-client \
- rsync
-RUN python3 -m pip install --upgrade pip wheel setuptools
-RUN python3 -m pip install git+https://gitlab.com/fdroid/fdroidserver.git
+ENV SCP_SSH_KEY /inputs/wallet.taler.net
+ENV SCP_SSH_HOST avalos@gv.taler.net
+ENV SCP_SSH_PATH /var/www/files
WORKDIR /workdir
diff --git a/contrib/ci/jobs/1-wallet-deploy/config.ini b/contrib/ci/jobs/1-wallet-deploy/config.ini
@@ -0,0 +1,3 @@
+[build]
+HALT_ON_FAILURE = False
+WARN_ON_FAILURE = True
+\ No newline at end of file
diff --git a/contrib/ci/jobs/1-wallet-deploy/deploy.sh b/contrib/ci/jobs/1-wallet-deploy/deploy.sh
@@ -29,12 +29,22 @@ function deploy_apk {
[[ ! -f "${SCP_SSH_KEY}" ]] && return 0
echo "Deploying APK to taler.net/files ..."
+ apk_dest="${SCP_SSH_PATH}"/wallet/wallet-nightly-debug-$(date -u +%s).apk
+ latest_dest="${SCP_SSH_PATH}"/wallet/wallet-nightly-debug-latest.apk
+
# Deploy APK to taler.net/files/wallet
scp -i "${SCP_SSH_KEY}" \
-o StrictHostKeyChecking=no \
-o UserKnownHostsFile=/dev/null \
"${APK_PATH}" \
- "${SCP_DEST}"/wallet/wallet-nightly-debug-$(date -u +%s).apk
+ "${SCP_SSH_HOST}":"${apk_dest}"
+
+ # Create symbolic link to the latest version
+ ssh -i "${SCP_SSH_KEY}" \
+ -o StrictHostKeyChecking=no \
+ -o UserKnownHostsFile=/dev/null \
+ "${SCP_SSH_HOST}" \
+ ln -sfr "${apk_dest}" "${latest_dest}"
}
diff --git a/contrib/ci/jobs/2-cashier-deploy/config.ini b/contrib/ci/jobs/2-cashier-deploy/config.ini
@@ -0,0 +1,3 @@
+[build]
+HALT_ON_FAILURE = False
+WARN_ON_FAILURE = True
+\ No newline at end of file
diff --git a/contrib/ci/jobs/2-cashier-deploy/deploy.sh b/contrib/ci/jobs/2-cashier-deploy/deploy.sh
@@ -39,12 +39,22 @@ function deploy_apk {
[[ ! -f "${SCP_SSH_KEY}" ]] && return 0
echo "Deploying APK to taler.net/files ..."
+ apk_dest="${SCP_SSH_PATH}"/cashier/cashier-nightly-debug-${versionCode}.apk
+ latest_dest="${SCP_SSH_PATH}"/cashier/cashier-nightly-debug-latest.apk
+
# Deploy APK to taler.net/files/cashier
scp -i "${SCP_SSH_KEY}" \
-o StrictHostKeyChecking=no \
-o UserKnownHostsFile=/dev/null \
"${APK_PATH}" \
- "${SCP_DEST}"/cashier/cashier-nightly-debug-${versionCode}.apk
+ "${SCP_SSH_HOST}":"${apk_dest}"
+
+ # Create symbolic link to the latest version
+ ssh -i "${SCP_SSH_KEY}" \
+ -o StrictHostKeyChecking=no \
+ -o UserKnownHostsFile=/dev/null \
+ "${SCP_SSH_HOST}" \
+ ln -sfr "${apk_dest}" "${latest_dest}"
}
diff --git a/contrib/ci/jobs/3-merchant-terminal-deploy/config.ini b/contrib/ci/jobs/3-merchant-terminal-deploy/config.ini
@@ -0,0 +1,3 @@
+[build]
+HALT_ON_FAILURE = False
+WARN_ON_FAILURE = True
+\ No newline at end of file
diff --git a/contrib/ci/jobs/3-merchant-terminal-deploy/deploy.sh b/contrib/ci/jobs/3-merchant-terminal-deploy/deploy.sh
@@ -47,12 +47,22 @@ function deploy_apk {
[[ ! -f "${SCP_SSH_KEY}" ]] && return 0
echo "Deploying APK to taler.net/files ..."
- # Deploy APK to taler.net/files/pos
+ apk_dest="${SCP_SSH_PATH}"/merchant-terminal/merchant-terminal-nightly-debug-${versionCode}.apk
+ latest_dest="${SCP_SSH_PATH}"/merchant-terminal/merchant-terminal-nightly-debug-latest.apk
+
+ # Deploy APK to taler.net/files/cashier
scp -i "${SCP_SSH_KEY}" \
-o StrictHostKeyChecking=no \
-o UserKnownHostsFile=/dev/null \
"${APK_PATH}" \
- "${SCP_DEST}"/merchant-terminal/merchant-terminal-nightly-debug-${versionCode}.apk
+ "${SCP_SSH_HOST}":"${apk_dest}"
+
+ # Create symbolic link to the latest version
+ ssh -i "${SCP_SSH_KEY}" \
+ -o StrictHostKeyChecking=no \
+ -o UserKnownHostsFile=/dev/null \
+ "${SCP_SSH_HOST}" \
+ ln -sfr "${apk_dest}" "${latest_dest}"
}
