From 36bdbac77603d827912429a2db07941765640890 Mon Sep 17 00:00:00 2001 From: Aric Gardner Date: Mon, 5 Aug 2019 22:08:41 -0400 Subject: [PATCH] Had an if where I needed a fi Also the git fetch needs the dashed version git fetch "$PATCH_DIR/${PROJECT//\//-}.bundle" Signed-off-by: Aric Gardner Change-Id: Ib4245be2b46645fca93225a5c32efb904acd68c8 --- releasenotes/notes/fix-if-release-job-00c86eecc6a92e2b.yaml | 5 +++++ shell/release-job.sh | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 releasenotes/notes/fix-if-release-job-00c86eecc6a92e2b.yaml diff --git a/releasenotes/notes/fix-if-release-job-00c86eecc6a92e2b.yaml b/releasenotes/notes/fix-if-release-job-00c86eecc6a92e2b.yaml new file mode 100644 index 00000000..69a2f44e --- /dev/null +++ b/releasenotes/notes/fix-if-release-job-00c86eecc6a92e2b.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Git fetch needs the dashed version git fetch + "$PATCH_DIR/${PROJECT//\//-}.bundle". Fix if statement. diff --git a/shell/release-job.sh b/shell/release-job.sh index ad118ded..dfc65db7 100644 --- a/shell/release-job.sh +++ b/shell/release-job.sh @@ -116,10 +116,10 @@ if git tag -v "$VERSION"; then echo "Repo already tagged $VERSION" echo "This job has already run exit 0" exit 0 -if +fi git checkout "$(awk '{print $NF}' "$PATCH_DIR/taglist.log")" -git fetch "$PATCH_DIR/$PROJECT.bundle" +git fetch "$PATCH_DIR/${PROJECT//\//-}.bundle" git merge --ff-only FETCH_HEAD git tag -am "${PROJECT//\//-} $VERSION" "$VERSION" sigul --batch -c "$SIGUL_CONFIG" sign-git-tag "$SIGUL_KEY" "$VERSION" < "$SIGUL_PASSWORD" @@ -145,5 +145,5 @@ fi # This function: if merge push to nexus. If verify output the proposed push command. nexus_release - -echo "########### End Script release-job.sh ###################################" +# +#echo "########### End Script release-job.sh ###################################" -- 2.16.6