diff --git a/.bumpversion.toml b/.bumpversion.toml index 37d9aa16d1b47c60117d0790e0693d326c62646e..27feca530e3aba2fef3163a752dd6515d804ed0b 100644 --- a/.bumpversion.toml +++ b/.bumpversion.toml @@ -1,7 +1,6 @@ [tool.bumpversion] commit = true -config-file = "pyproject.toml" -current_version = "0.4.5" +current_version = "0.4.6" parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)" replace = "{new_version}" search = "{current_version}" @@ -22,5 +21,3 @@ search = """## [Unreleased] [[tool.bumpversion.files]] allow-dirty = true filename = "README.md" -replace = "{new_version}" -search = "{current_version}" diff --git a/CHANGELOG.md b/CHANGELOG.md index d03c7dfb4adaa6de36b519f5637ff7a541bf9a4c..aab8513a2a55b39b0bbd7096d806417f7363134f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.4.6] - 2024-08-02 + +* Misc updates and improvements for development team + ## [0.4.5] - 2024-08-01 * Update documentation diff --git a/README.md b/README.md index 4783259012fc71789654339fd1910f2a61f13288..79f0ab458d1f08b9a43918ee5f32bec2bfd0b577 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ your instance: ```yaml include: - - component: $CI_SERVER_FQDN/swepy/cicd-templates/release-by-changelog/release-by-changelog@0.4.5 + - component: $CI_SERVER_FQDN/swepy/cicd-templates/release-by-changelog/release-by-changelog@0.4.6 ``` [](https://gitlab.com) @@ -31,7 +31,7 @@ As a remote Template if the component is not supported or mirrored by your insta ```yaml include: - - remote: 'https://gitlab.com/swepy/cicd-templates/release-by-changelog/-/raw/0.4.5/templates/release-by-changelog.yml' + - remote: 'https://gitlab.com/swepy/cicd-templates/release-by-changelog/-/raw/0.4.6/templates/release-by-changelog.yml' ``` ### Customize job diff --git a/templates/release-by-changelog.yml b/templates/release-by-changelog.yml index 85ab47475c6cbfedc4fcc704fa7772a0a1480aee..730bf5a6d0f50e1fc1a398f4249f4bf6c5fb9d08 100644 --- a/templates/release-by-changelog.yml +++ b/templates/release-by-changelog.yml @@ -1,6 +1,6 @@ release_by_changelog: variables: - CHANGELOG_FILEPATH: 'CHANGELOG.md' + CHANGELOG_FILEPATH: CHANGELOG.md PREFIX: '' SUFFIX: '' TAG_PREFIX: $PREFIX @@ -17,52 +17,51 @@ release_by_changelog: - 'first_line=$(echo "$headers" | head -1 | cut -d: -f1)' # Check if we have a header, else exit - - 'if [ -z "$first_line" ]; then' - - ' echo "No version headers found."' - - ' exit 1' - - 'fi' + - if [ -z "$first_line" ]; then + - echo "No version headers found." + - exit 1 + - fi # Extract version and date from the first header - - 'version=$(echo "$headers" | head -1 | grep -oE "\[([0-9]+)\.([0-9]+)\.([0-9]+)\]" | tr -d "[]")' - - 'date=$(echo "$headers" | head -1 | grep -oE "[0-9]{4}-[0-9]{2}-[0-9]{2}")' + - version=$(echo "$headers" | head -1 | grep -oE "\[([0-9]+)\.([0-9]+)\.([0-9]+)\]" | tr -d "[]") + - date=$(echo "$headers" | head -1 | grep -oE "[0-9]{4}-[0-9]{2}-[0-9]{2}") # If date is different from today, format it - - 'if [ "$date" != "$(date +%Y-%m-%d)" ]; then' - - ' formatted_date=$(date -u -d "$date" +"%Y-%m-%dT%H:%M:%SZ")' - - 'fi' + - if [ "$date" != "$(date +%Y-%m-%d)" ]; then + - formatted_date=$(date -u -d "$date" +"%Y-%m-%dT%H:%M:%SZ") + - fi # Extract second header line number for end of text range - 'second_line=$(echo "$headers" | sed -n "2p" | cut -d: -f1)' # Determine end line - - 'if [ -n "$second_line" ]; then' - - ' end_line=$((second_line - 1))' - - 'else' - - ' # If there s no second header, use the end of the file' - - ' end_line=$(wc -l < "$CHANGELOG_FILEPATH")' - - 'fi' + - if [ -n "$second_line" ]; then + - end_line=$((second_line - 1)) + - else + # If there's no second header, use the end of the file + - end_line=$(wc -l < "$CHANGELOG_FILEPATH") + - fi - - 'start_line=$((first_line + 2))' - - 'if [ "$start_line" -le "$end_line" ]; then' + - start_line=$((first_line + 2)) + - if [ "$start_line" -le "$end_line" ]; then # Use sed to extract the text between the first and the potential second version header - - ' text=$(sed -n "$start_line,$end_line p" "$CHANGELOG_FILEPATH")' - - ' echo "Text:"' - - ' echo "$text"' - - 'else' - - ' echo "No text to extract, start line exceeds end line."' - - 'fi' + - text=$(sed -n "$start_line,$end_line p" "$CHANGELOG_FILEPATH") + - echo "Text = $text" + - else + - echo "No text to extract, start line exceeds end line." + - fi # Output the results - - 'echo "Version: $version"' - - 'echo "Date: $date"' - - 'echo "Formatted Date: $formatted_date"' - - 'echo "Text:"' - - 'echo "$text"' + - echo "Version = $version" + - echo "Date = $date" + - echo "Formatted Date = $formatted_date" + - echo "Text:" + - echo "$text" # Set the tag and name - - 'tag="$TAG_PREFIX$version$TAG_SUFFIX"' - - 'name="$NAME_PREFIX$version$NAME_SUFFIX"' + - tag="$TAG_PREFIX$version$TAG_SUFFIX" + - name="$NAME_PREFIX$version$NAME_SUFFIX" # Create the release - - 'release-cli create --name "$name" --tag-name "$tag" --description "$text" --released-at "$formatted_date"' + - release-cli create --name "$name" --tag-name "$tag" --description "$text" --released-at "$formatted_date" rules: - - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH