diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml deleted file mode 100644 index 6494aaf38..000000000 --- a/.github/workflows/changelog.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: "Changelog Workflow" -on: - workflow_dispatch: - workflow_call: - -jobs: - changelog: - runs-on: ubuntu-latest - steps: - - uses: dangoslen/changelog-enforcer@v3 - with: - skipLabels: "Skip-Changelog,dependencies" diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 39702102b..1a076f13b 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -14,22 +14,15 @@ permissions: pull-requests: write jobs: - changelog: - name: Enforce CHANGELOG - if: github.event.pull_request.draft == false - uses: ./.github/workflows/changelog.yml - linters: name: Run linters if: github.event.pull_request.draft == false uses: ./.github/workflows/linters.yml - needs: changelog rust_check: name: Run check if: github.event.pull_request.draft == false uses: ./.github/workflows/rust-check.yml - needs: changelog linters_cargo: name: Run Cargo linters @@ -41,13 +34,11 @@ jobs: name: Run Coverage if: github.event.pull_request.draft == false uses: ./.github/workflows/coverage.yml - needs: changelog secrets: inherit build: name: Build Madara uses: ./.github/workflows/build.yml - needs: changelog js_test: name: Run JS Tests diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 08f2ca67d..a00635d05 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,6 +16,14 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Generate Release Notes + id: generate_notes + uses: conventional-changelog/releaser-action@v1 + with: + preset: "angular" - name: Create GitHub Release uses: ncipollo/release-action@v1 @@ -26,4 +34,4 @@ jobs: commit: ${{ github.sha }} draft: false prerelease: false - generateReleaseNotes: true + body: ${{ steps.generate_notes.outputs.notes }}