From 22b1d1c1a4cfab3a43ac3dde1671382db7b2e500 Mon Sep 17 00:00:00 2001 From: Julien Dessaux Date: Wed, 7 Sep 2022 23:50:20 +0200 Subject: Moved away from job parameters to command arguments --- common/clean.sh | 3 +-- common/git-clone.sh | 5 ++--- common/make.sh | 5 ++--- eventline/ev-scripts-deploy.yaml | 21 ++++++++------------- 4 files changed, 13 insertions(+), 21 deletions(-) diff --git a/common/clean.sh b/common/clean.sh index 40ec605..1ce9e66 100644 --- a/common/clean.sh +++ b/common/clean.sh @@ -1,7 +1,6 @@ #!/usr/bin/env bash set -euo pipefail -# Input environment: -# - NAME: a name for the script/tasks +NAME=$1 rm -rf "/tmp/${NAME}" diff --git a/common/git-clone.sh b/common/git-clone.sh index 1a1a89c..d502aca 100644 --- a/common/git-clone.sh +++ b/common/git-clone.sh @@ -1,9 +1,8 @@ #!/usr/bin/env bash set -euo pipefail -# Input environment: -# - NAME: a name for the script/tasks -# - URL: the url of the repository to clone +NAME=$1 +URL=$2 WORKDIR="/tmp/${NAME}" diff --git a/common/make.sh b/common/make.sh index c3b0912..f103167 100644 --- a/common/make.sh +++ b/common/make.sh @@ -1,9 +1,8 @@ #!/usr/bin/env bash set -euo pipefail -# Input environment: -# - NAME: a name for the script/tasks -# - TARGET: the Makefile target to run +NAME=$1 +TARGET=$2 WORKDIR="/tmp/${NAME}" diff --git a/eventline/ev-scripts-deploy.yaml b/eventline/ev-scripts-deploy.yaml index 21fb320..2471747 100644 --- a/eventline/ev-scripts-deploy.yaml +++ b/eventline/ev-scripts-deploy.yaml @@ -3,24 +3,19 @@ steps: - label: git clone script: path: "../common/git-clone.sh" + arguments: + - "ev-scripts-deploy" + - "https://git.adyxax.org/adyxax/ev-scripts" - label: make run script: path: "../common/make.sh" + arguments: + - "ev-scripts-deploy" + - "run" - label: clean script: path: "../common/clean.sh" + arguments: + - "ev-scripts-deploy" identities: - eventline-self -parameters: -- name: name - type: string - default: "ev-scripts-deploy" - environment: NAME -- name: target - type: string - default: "run" - environment: TARGET -- name: url - type: string - default: "https://git.adyxax.org/adyxax/ev-scripts" - environment: URL -- cgit v1.2.3