diff --git a/.env.ios b/.env.ios index 906e8700..7cb4f0a1 100644 --- a/.env.ios +++ b/.env.ios @@ -5,3 +5,4 @@ DELIVER_PLATFORM="ios" DELIVER_METADATA_PATH="Passepartout/App/fastlane/ios/metadata" DELIVER_SCREENSHOTS_PATH="Passepartout/App/fastlane/ios/screenshots" PILOT_PLATFORM="ios" +CHANGELOG="CHANGELOG.md" diff --git a/.env.mac b/.env.mac index 79c707bc..46aa9771 100644 --- a/.env.mac +++ b/.env.mac @@ -7,3 +7,4 @@ DELIVER_PLATFORM="osx" DELIVER_METADATA_PATH="Passepartout/App/fastlane/mac/metadata" DELIVER_SCREENSHOTS_PATH="Passepartout/App/fastlane/mac/screenshots" PILOT_PLATFORM="osx" +CHANGELOG="CHANGELOG.md" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a77d99f1..7ef5e84d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,6 +5,7 @@ on: types: [ opened, synchronize ] paths-ignore: - '.beta-*' + - '.env.*' - '**/*.md' - '**/*.sh' - '**/*.yml' diff --git a/ci/latest-changelog.sh b/ci/latest-changelog.sh index 5011d7ce..4a390778 100755 --- a/ci/latest-changelog.sh +++ b/ci/latest-changelog.sh @@ -1,7 +1,6 @@ #!/bin/bash . .env.$1 -CHANGELOG="CHANGELOG.md" RELEASES=(`grep -n "^## " $CHANGELOG | sed -E "s/^([0-9]+).*$/\1/g"`) UNRELEASED=${RELEASES[0]} LATEST=${RELEASES[1]} @@ -11,4 +10,11 @@ if [ ! $LATEST ]; then cat $CHANGELOG | tail -n $((LATEST - UNRELEASED - 1)) exit fi -cat $CHANGELOG | head -n $((LATEST - 1)) | tail -n $((LATEST - UNRELEASED - 2)) + +if [ "$2" = "stripped" ]; then + SED_STRIPPED="sed -E 's/^(.*)\. \[.*$/\1./'" +else + SED_STRIPPED="cat" +fi + +cat $CHANGELOG | head -n $((LATEST - 1)) | tail -n $((LATEST - UNRELEASED - 2)) | eval $SED_STRIPPED diff --git a/ci/update-release-notes.sh b/ci/update-release-notes.sh index e3b8823a..83692b80 100755 --- a/ci/update-release-notes.sh +++ b/ci/update-release-notes.sh @@ -2,6 +2,5 @@ . .env.$1 RELEASE_NOTES="$DELIVER_METADATA_PATH/en-US/release_notes.txt" -STRIPPED_ISSUES_SUB="s/^(.*)\. \[.*$/\1./" -ci/latest-changelog.sh $1 | sed -E "$STRIPPED_ISSUES_SUB" >"$RELEASE_NOTES" +ci/latest-changelog.sh $1 stripped >"$RELEASE_NOTES" diff --git a/scripts/ci/release-notes.sh b/scripts/ci/release-notes.sh index 9ed4830b..ac026f7d 100755 --- a/scripts/ci/release-notes.sh +++ b/scripts/ci/release-notes.sh @@ -8,6 +8,6 @@ fi APP_ROOT="Passepartout/App" echo "# App Store" echo -grep $VERSION CHANGELOG.md | cut -f 2- -d " " +grep -E "$VERSION \(" CHANGELOG.md | cut -f 2- -d " " echo -cat $APP_ROOT/fastlane/ios/metadata/en-US/release_notes.txt +ci/latest-changelog.sh ios