From 0f0764ad4c089e7701384c31b4b5e4124d01204d Mon Sep 17 00:00:00 2001 From: David Cheung Date: Fri, 26 Mar 2021 11:57:59 -0400 Subject: [PATCH] fix: migration script fails upon more than 1 file --- templates/.circleci/config.yml | 2 +- templates/.github/actions/db-migration/action.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/.circleci/config.yml b/templates/.circleci/config.yml index c50496a..ec7fbd8 100644 --- a/templates/.circleci/config.yml +++ b/templates/.circleci/config.yml @@ -254,7 +254,7 @@ jobs: SQL_DIR="${PWD}/database/migration" pushd kubernetes/migration kubectl -n $NAMESPACE delete configmap $MIGRATION_NAME || echo "no migration configmap existing for deletion" - if [ -f ${SQL_DIR}/*.sql ] ; then + if [ `ls ${SQL_DIR}/*.sql 2>/dev/null | wc -l` -gt 0 ] ; then kubectl -n $NAMESPACE create configmap $MIGRATION_NAME --from-file ${SQL_DIR}/*.sql else kubectl -n $NAMESPACE create configmap $MIGRATION_NAME diff --git a/templates/.github/actions/db-migration/action.yml b/templates/.github/actions/db-migration/action.yml index c5b4371..0c97eba 100644 --- a/templates/.github/actions/db-migration/action.yml +++ b/templates/.github/actions/db-migration/action.yml @@ -20,7 +20,7 @@ runs: kubectl -n $NAMESPACE delete configmap $MIGRATION_NAME || echo "no migration configmap existing for deletion" kubectl -n $NAMESPACE delete job $MIGRATION_NAME || echo "no migration job existing for deletion" - if [ -f ${SQL_DIR}/*.sql ] ; then + if [ `ls ${SQL_DIR}/*.sql 2>/dev/null | wc -l` -gt 0 ] ; then pushd kubernetes/migration kubectl -n $NAMESPACE delete configmap $MIGRATION_NAME || echo "no migration configmap existing for deletion" kubectl -n $NAMESPACE create configmap $MIGRATION_NAME --from-file ${SQL_DIR}/*.sql