From ef9f044729886ed5c06b282f1b75e9ff8d4aa4d6 Mon Sep 17 00:00:00 2001 From: Nikita Vasilev Date: Fri, 28 Nov 2025 11:59:58 +0400 Subject: [PATCH 1/2] ci: update the changelog file generation --- .github/workflows/release.yml | 4 ++-- CHANGELOG.md | 10 ++-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8446874..e3b0ea4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ permissions: jobs: release: name: release - runs-on: "ubuntu-latest" + runs-on: "macos-latest" timeout-minutes: 15 steps: - uses: actions/checkout@v6 @@ -74,7 +74,7 @@ jobs: echo "and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)." >> "$GITHUB_OUTPUT" echo "" >> "$GITHUB_OUTPUT" - git cliff --config ./cliff.toml --latest --strip header | awk 'NF{p=1} p' | tail -n +2 >> "$GITHUB_OUTPUT" + git cliff --config ./cliff.toml --tag ${{ steps.next-version.outputs.NEXT_VERSION }} --unreleased --strip header | awk 'NF{p=1} p' | tail -n +2 >> "$GITHUB_OUTPUT" echo "EOF" >> "$GITHUB_OUTPUT" - name: Commit changes diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e0245d..562267f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,17 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). #### 1.x Releases -- `1.3.x` Releases - [1.3.0](#130) - `1.2.x` Releases - [1.2.0](#120) - `1.1.x` Releases - [1.1.0](#110) - `1.0.x` Releases - [1.0.1](#101) | [1.0.0](#100) --- - - -## [1.3.0](https://github.com/space-code/validator/releases/tag/1.3.0) - -Released on 2025-11-28. All issues associated with this milestone can be found using this [filter](https://github.com/space-code/validator/milestones?state=closed&q=1.3.0). +## [Unreleased] ### Bug Fixes - Fix the lint action @@ -168,8 +163,7 @@ Released on 2023-10-09. All issues associated with this milestone can be found u - Implement `Validator` package - Contributed by [@ns-vasilev](https://github.com/ns-vasilev) in Pull Request [#1](https://github.com/space-code/validator/pull/1). -[1.3.0]: https://github.com/space-code/validator/compare/1.2.0..1.3.0 +[unreleased]: https://github.com/space-code/validator/compare/1.2.0..HEAD [1.2.0]: https://github.com/space-code/validator/compare/1.1.0..1.2.0 [1.1.0]: https://github.com/space-code/validator/compare/1.0.1..1.1.0 [1.0.1]: https://github.com/space-code/validator/compare/1.0.0..1.0.1 - From 99c561d8ccf26877b377de30fd45413bbd924117 Mon Sep 17 00:00:00 2001 From: Nikita Vasilev Date: Fri, 28 Nov 2025 12:17:49 +0400 Subject: [PATCH 2/2] ci: split jobs --- .github/workflows/release.yml | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e3b0ea4..75aafb5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ permissions: jobs: release: name: release - runs-on: "macos-latest" + runs-on: ubuntu-latest timeout-minutes: 15 steps: - uses: actions/checkout@v6 @@ -96,18 +96,28 @@ jobs: tag_name: ${{ steps.next-version.outputs.NEXT_VERSION }} body: ${{ steps.release-notes.outputs.RELEASE_NOTES }} target_commitish: ${{ steps.auto-commit-action.outputs.commit_hash }} + + docc: + name: build and deploy docc + runs-on: macos-latest + needs: release + if: ${{ needs.release.outputs.has-changes == 'true' }} + timeout-minutes: 15 + steps: + - uses: actions/checkout@v6 + with: + ref: ${{ needs.release.outputs.commit-hash }} + fetch-depth: 0 - name: Build DocC id: build uses: space-code/build-docc@main - if: steps.check-changes.outputs.has-changes == 'true' with: schemes: '["ValidatorCore", "ValidatorUI"]' - version: ${{ steps.next-version.outputs.NEXT_VERSION }} + version: ${{ needs.release.outputs.next-version }} - name: Generate Index Page uses: space-code/generate-index@v1.0.0 - if: steps.check-changes.outputs.has-changes == 'true' with: - version: ${{ steps.next-version.outputs.NEXT_VERSION }} + version: ${{ needs.release.outputs.next-version }} project-name: 'Validator' project-description: 'Validator is a modern, lightweight Swift framework that provides elegant and type-safe input validation.' modules: | @@ -127,7 +137,6 @@ jobs: ] - name: Deploy uses: peaceiris/actions-gh-pages@v4 - if: steps.check-changes.outputs.has-changes == 'true' with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: ./docs \ No newline at end of file