From dd2358d241de4d7256ba6f4dda20ccbe68ceffd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sat, 11 Jul 2020 13:31:00 +0200 Subject: [PATCH 1/2] feat: allow checking out pokeapi --- updater/cmd.bash | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/updater/cmd.bash b/updater/cmd.bash index 14bcd5d16e..02055b0eaa 100644 --- a/updater/cmd.bash +++ b/updater/cmd.bash @@ -6,6 +6,7 @@ [ -z "${REPO_POKEAPI}" ] && { echo "Need to set REPO_POKEAPI"; exit 1; } [ -z "${REPO_DATA}" ] && { echo "Need to set REPO_DATA"; exit 1; } [ -z "${BRANCH_NAME}" ] && { echo "Need to set BRANCH_NAME"; exit 1; } +[ -z "${REPO_POKEAPI_CHECKOUT_OBJECT:=master}" ] && { echo "REPO_POKEAPI_CHECKOUT_OBJECT not set, defaulting to \`master\`"; } set -e set -o pipefail @@ -15,11 +16,14 @@ export COMPOSE_INTERACTIVE_NO_CLI=1 dockerd --host=unix:///var/run/docker.sock --host=tcp://0.0.0.0:2375 &> /dev/null & -git clone --recurse-submodules "$REPO_POKEAPI" pokeapi +git clone "$REPO_POKEAPI" pokeapi git clone --depth=1 "$REPO_DATA" api-data # set up the pokeapi side cd pokeapi +git checkout "$REPO_POKEAPI_CHECKOUT_OBJECT" +git submodule init +git submodule update --remote docker volume create --name=redis_data docker volume create --name=pg_data From febb361a48874c144addd44ef6615f1c0b6e3915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sat, 11 Jul 2020 15:32:21 +0200 Subject: [PATCH 2/2] refactor(updater): fail with exit code on commit --- updater/cmd.bash | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/updater/cmd.bash b/updater/cmd.bash index 02055b0eaa..da93cad3e1 100644 --- a/updater/cmd.bash +++ b/updater/cmd.bash @@ -49,5 +49,8 @@ ditto analyze --data-dir ./data git add data git config user.name "$COMMIT_NAME" git config user.email "$COMMIT_EMAIL" -git commit -m "$COMMIT_MESSAGE" +if ! git commit -m "$COMMIT_MESSAGE"; then + echo "The generated data doesn't bring any updates" + exit 2 +fi git push -fu origin "$BRANCH_NAME"