ci: release notes are not updated correctly fix

testwill · Apr 4, 2023 · cc66ecc · cc66ecc
1 parent 30553d2
commit cc66ecc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/scripts/custom_changelog.sh b/scripts/custom_changelog.sh
@@ -5,10 +5,10 @@ git rev-parse --abbrev-ref HEAD # Show current branch
 git status
 git log -n 5 --format="%h" > latest5commits.txt 
 cat latest5commits.txt 
-
-git checkout main
-git fetch --unshallow
+git log -n 5 > latest5commits.txt 
+cat latest5commits.txt 
 git pull --unshallow
+git checkout main
 git status
 git log -n 5 --format="%h" > latest5commits.txt
 cat latest5commits.txt

diff --git a/scripts/release.sh b/scripts/release.sh
@@ -5,7 +5,6 @@ release_tag=$RELEASE_VERSION
 v_release_tag=v$release_tag
 
 git fetch
-bash ./scripts/custom_changelog.sh
 
 git checkout "$release_tag-rc"
 
@@ -18,6 +17,7 @@ git push origin $v_release_tag
 export DATREE_BUILD_VERSION=$release_tag
 echo $DATREE_BUILD_VERSION
 
+bash ./scripts/custom_changelog.sh
 cat changelog.txt
 curl -sL https://git.io/goreleaser | GORELEASER_CURRENT_TAG=$DATREE_BUILD_VERSION GO_BUILD_TAG=main VERSION=v$GORELEASER_VERSION bash -s -- --rm-dist --release-notes=changelog.txt