diff --git a/pages_builder/push_to_github_pages.sh b/pages_builder/push_to_github_pages.sh index 084b987c..633233de 100644 --- a/pages_builder/push_to_github_pages.sh +++ b/pages_builder/push_to_github_pages.sh @@ -17,7 +17,6 @@ then exit 0 fi -current_branch=$(git rev-parse --abbrev-ref HEAD) build_from=$1 destination_repo=git@github.com:alphagov/digitalmarketplace-frontend-toolkit.git destination_branch=gh-pages diff --git a/pages_builder/tag_latest_version.sh b/pages_builder/tag_latest_version.sh index 20317a43..22869710 100755 --- a/pages_builder/tag_latest_version.sh +++ b/pages_builder/tag_latest_version.sh @@ -8,7 +8,7 @@ git pull origin master commit=$(git log master --pretty=oneline --abbrev-commit --no-decorate | grep "Bump version to" | head -n1) sha=$(echo $commit | cut -d ' ' -f1) version=v$(cat VERSION.txt) -previous_version=$(git tag|tail -n1) +previous_version=$(git describe --abbrev=0 ${version}^) changes=$(git log --merges --oneline $previous_version..$sha) echo Commit:\ \ \ $commit echo Version:\ \ $version