diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 3a6e895..82f3838 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -12,5 +12,3 @@ on: jobs: call-changelog-check-workflow: uses: ASFHyP3/actions/.github/workflows/reusable-changelog-check.yml@v0.11.0 - secrets: - USER_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/reusable-changelog-check.yml b/.github/workflows/reusable-changelog-check.yml index 6ee0eaa..22c97e3 100644 --- a/.github/workflows/reusable-changelog-check.yml +++ b/.github/workflows/reusable-changelog-check.yml @@ -1,19 +1,14 @@ on: workflow_call: - secrets: - USER_TOKEN: - required: true jobs: changelog-updated: + if: ${{ ! contains(github.event.pull_request.labels.*.name, 'bumpless') }} runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - - name: Changelog check - uses: Zomzog/changelog-checker@v1.3.0 with: - fileName: CHANGELOG.md - noChangelogLabel: bumpless - env: - GITHUB_TOKEN: ${{ secrets.USER_TOKEN }} + fetch-depth: 0 + - name: Changelog check + run: '! git diff --quiet "origin/${{ github.event.pull_request.base.ref }}" -- CHANGELOG.md' + shell: bash diff --git a/CHANGELOG.md b/CHANGELOG.md index e114ace..4b780a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [PEP 440](https://www.python.org/dev/peps/pep-0440/) and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.11.1] + +### Fixed +- Modified the [`reusable-changelog-check`](.github/workflows/reusable-changelog-check.yml) workflow to remove its dependency on a third-party action. The workflow behavior should remain unchanged except that applying the `bumpless` label now results in the workflow being skipped rather than succeeding. Fixes https://github.com/ASFHyP3/actions/issues/156 + - When upgrading this reusable action in your repository, remove the following lines from the calling workflow: + ```diff + - secrets: + - USER_TOKEN: ${{ secrets.GITHUB_TOKEN }} + ``` + ## [0.11.0] ### Fixed diff --git a/README.md b/README.md index 1e9ae39..b84920f 100644 --- a/README.md +++ b/README.md @@ -69,8 +69,6 @@ on: jobs: call-changelog-check-workflow: uses: ASFHyP3/actions/.github/workflows/reusable-changelog-check.yml@v0.11.0 - secrets: - USER_TOKEN: ${{ secrets.GITHUB_TOKEN }} ``` to ensure the changelog has been updated for any PR to `develop` or `main`.