From a2866ab3610ba7b04a4d95d7702c439501fdd91f Mon Sep 17 00:00:00 2001 From: obarun <eric@obarun.org> Date: Sat, 31 Aug 2019 00:40:55 +1100 Subject: [PATCH] update deploy.sh script --- .deploy.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.deploy.sh b/.deploy.sh index 5d59c61..e1a7873 100755 --- a/.deploy.sh +++ b/.deploy.sh @@ -87,13 +87,15 @@ mkdir -p version/${pkgver}-${pkgrel} || die "Unable to make directory version/${ out_trace "Copy file from trunk to version/${pkgver}-${pkgrel}" cp trunk/* version/${pkgver}-${pkgrel} || die "Unable to copy trunk/* to version/${pkgver}-${pkgrel}" -out_trace "Git add new file" -git add . || die "Unable to git add" +if ! git diff-index --quiet HEAD; then + out_trace "Git add new file" + git add . || die "Unable to git add" -out_trace "Git commit message: upgpkg: ${pkgver}-${pkgrel}" -git commit -m "upgpkg: ${pkgver}-${pkgrel}" || die "Unable to commit" + out_trace "Git commit message: upgpkg: ${pkgver}-${pkgrel}" + git commit -m "upgpkg: ${pkgver}-${pkgrel}" || die "Unable to commit" -out_trace "Push the new version" -git push --all || die "Unable to push at git@${CI_SERVER_HOST}:/${CI_PROJECT_PATH}.git" + out_trace "Push the new version" + git push --all || die "Unable to push at git@${CI_SERVER_HOST}:/${CI_PROJECT_PATH}.git" +fi exit 0 -- GitLab