From 29e6c829e3259bcf856b00ecb2137a3ad4676271 Mon Sep 17 00:00:00 2001 From: Julien Dessaux Date: Mon, 5 Sep 2022 00:04:35 +0200 Subject: Factorised ev-scripts-deploy in a generic git clone && make run --- common/make-run.sh | 15 +++++++++++++++ eventline/ev-scripts-deploy.sh | 15 --------------- eventline/ev-scripts-deploy.yaml | 13 ++++++++++++- 3 files changed, 27 insertions(+), 16 deletions(-) create mode 100644 common/make-run.sh delete mode 100644 eventline/ev-scripts-deploy.sh diff --git a/common/make-run.sh b/common/make-run.sh new file mode 100644 index 0000000..8c719b2 --- /dev/null +++ b/common/make-run.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +set -euo pipefail + +WORKDIR="/tmp/${NAME}" + +cleanup() { + cd / + rm -rf "${WORKDIR}" +} + +trap cleanup EXIT + +git clone -q "${URL}" "${WORKDIR}" +cd "${WORKDIR}" +make run diff --git a/eventline/ev-scripts-deploy.sh b/eventline/ev-scripts-deploy.sh deleted file mode 100644 index c6b6f0d..0000000 --- a/eventline/ev-scripts-deploy.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -WORKDIR="/tmp/ev-scripts-deploy" - -cleanup() { - cd - rm -rf ${WORKDIR} -} - -trap cleanup EXIT - -git clone -q --depth 1 https://git.adyxax.org/adyxax/ev-scripts.git ${WORKDIR} -cd ${WORKDIR} -make run diff --git a/eventline/ev-scripts-deploy.yaml b/eventline/ev-scripts-deploy.yaml index 3dd5d2a..e01c567 100644 --- a/eventline/ev-scripts-deploy.yaml +++ b/eventline/ev-scripts-deploy.yaml @@ -1,4 +1,15 @@ name: "ev-scripts-deploy" steps: - script: - path: "ev-scripts-deploy.sh" + path: "../common/make-run.sh" +identities: + - eventline-self +parameters: +- name: name + type: string + default: "ev-scripts-deploy" + environment: NAME +- name: url + type: string + default: "https://git.adyxax.org/adyxax/ev-scripts" + environment: URL -- cgit v1.2.3