From dbbb71167c0bc7cdbd0bc28b56d38183ba3b6ea4 Mon Sep 17 00:00:00 2001 From: sksat Date: Sun, 16 Jan 2022 02:10:04 +0900 Subject: [PATCH 1/8] update: .compose-apply use relative path from .compose-cd dir --- compose-cd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/compose-cd b/compose-cd index 4538299..d168833 100755 --- a/compose-cd +++ b/compose-cd @@ -218,6 +218,9 @@ ${expand}" return 2 fi + # non top-level .compose-cd(monorepo): #30 + a="$(git rev-parse --show-prefix)${a}" + # exact match if git diff --name-only "${local_commit}" | grep "^${a}$"; then is_restart=true From 4301bcf31639828cdd4c9cbeef75b18d6718d8e8 Mon Sep 17 00:00:00 2001 From: sksat Date: Sun, 16 Jan 2022 02:28:51 +0900 Subject: [PATCH 2/8] update: split version string into semver element --- compose-cd | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/compose-cd b/compose-cd index d168833..1fe0eac 100755 --- a/compose-cd +++ b/compose-cd @@ -1,5 +1,10 @@ #!/bin/bash +COMPOSE_CD_VER_MAJOR='0' +COMPOSE_CD_VER_MINOR='3' +COMPOSE_CD_VER_PATCH='4' +COMPOSE_CD_VER_PRE='' + #function docker-compose(){ # local p=`pwd` # echo "[compose-mock]:$p $1 $2" @@ -8,7 +13,10 @@ function version() { local compose_cd_ver - compose_cd_ver="v0.3.4" + compose_cd_ver="v${COMPOSE_CD_VER_MAJOR}.${COMPOSE_CD_VER_MINOR}.${COMPOSE_CD_VER_PATCH}" + if [ -n "${COMPOSE_CD_VER_PRE}" ]; then + compose_cd_ver="${compose_cd_ver}-${COMPOSE_CD_VER_PRE}" + fi echo "version: ${compose_cd_ver}" } From 03ad93fbb93da0c20b6debdca0dd8b740e765850 Mon Sep 17 00:00:00 2001 From: sksat Date: Sun, 16 Jan 2022 02:38:29 +0900 Subject: [PATCH 3/8] fix: use here document for generate config file --- compose-cd | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/compose-cd b/compose-cd index 1fe0eac..8d63650 100755 --- a/compose-cd +++ b/compose-cd @@ -460,7 +460,13 @@ function install() { if [ -z ${discord_webhook+x} ]; then read -rp "Discord webhook URL> " discord_webhook; fi mkdir -p /etc/compose-cd - echo -e "SEARCH_ROOT=\"${search_root}\"\n\nGIT_PULL_USER=\"${git_pull_user}\"\n\nDISCORD_WEBHOOK=\"${discord_webhook}\"" | tee /etc/compose-cd/config + tee /etc/compose-cd/config << EOS +SEARCH_ROOT="${search_root}" + +GIT_PULL_USER="${git_pull_user}" + +DISCORD_WEBHOOK="${discord_webhook}" +EOS load_global_config notify "notify test" "[test] " From 4edfea8471a93012e51671ecdd762fabff0ba454 Mon Sep 17 00:00:00 2001 From: sksat Date: Sun, 16 Jan 2022 02:39:31 +0900 Subject: [PATCH 4/8] format: compose-cd Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- compose-cd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose-cd b/compose-cd index 8d63650..6335354 100755 --- a/compose-cd +++ b/compose-cd @@ -460,7 +460,7 @@ function install() { if [ -z ${discord_webhook+x} ]; then read -rp "Discord webhook URL> " discord_webhook; fi mkdir -p /etc/compose-cd - tee /etc/compose-cd/config << EOS + tee /etc/compose-cd/config < Date: Sun, 16 Jan 2022 02:45:30 +0900 Subject: [PATCH 5/8] add: save installed version information into config file --- compose-cd | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/compose-cd b/compose-cd index 6335354..b41623e 100755 --- a/compose-cd +++ b/compose-cd @@ -461,6 +461,11 @@ function install() { mkdir -p /etc/compose-cd tee /etc/compose-cd/config < Date: Thu, 20 Jan 2022 21:28:47 +0900 Subject: [PATCH 6/8] add: warning breaking change --- compose-cd | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/compose-cd b/compose-cd index b41623e..b834148 100755 --- a/compose-cd +++ b/compose-cd @@ -66,6 +66,14 @@ function load_global_config() { fi # shellcheck disable=SC1091 source /etc/compose-cd/config + + # version compatibility check + if [ "${COMPOSE_CD_VER_MAJOR}" != "${VER_MAJOR}" ]; then + notify "major version mismatch!!!: ${COMPOSE_CD_VER_MAJOR} != ${VER_MAJOR}" "[warn] " + fi + if [ "${COMPOSE_CD_VER_MINOR}" != "${VER_MINOR}" ]; then + notify "minor version mismatch!!!: ${COMPOSE_CD_VER_MINOR} != ${VER_MINOR}" "[warn] " + fi } function load_config() { From 6e38d49c112d91530339140234b59ec2cefdc110 Mon Sep 17 00:00:00 2001 From: sksat Date: Thu, 20 Jan 2022 21:57:39 +0900 Subject: [PATCH 7/8] release: v0.4.0-rc.1 --- compose-cd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compose-cd b/compose-cd index b834148..c2bed29 100755 --- a/compose-cd +++ b/compose-cd @@ -1,9 +1,9 @@ #!/bin/bash COMPOSE_CD_VER_MAJOR='0' -COMPOSE_CD_VER_MINOR='3' -COMPOSE_CD_VER_PATCH='4' -COMPOSE_CD_VER_PRE='' +COMPOSE_CD_VER_MINOR='4' +COMPOSE_CD_VER_PATCH='0' +COMPOSE_CD_VER_PRE='rc.1' #function docker-compose(){ # local p=`pwd` From ded9105513407a35861f8afab36d2c68a63acf86 Mon Sep 17 00:00:00 2001 From: sksat Date: Thu, 20 Jan 2022 22:08:44 +0900 Subject: [PATCH 8/8] release: v0.4.0 --- compose-cd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose-cd b/compose-cd index c2bed29..8cda55c 100755 --- a/compose-cd +++ b/compose-cd @@ -3,7 +3,7 @@ COMPOSE_CD_VER_MAJOR='0' COMPOSE_CD_VER_MINOR='4' COMPOSE_CD_VER_PATCH='0' -COMPOSE_CD_VER_PRE='rc.1' +COMPOSE_CD_VER_PRE='' #function docker-compose(){ # local p=`pwd`