From 7a33b90e9d9c675392d8110be3486de076694549 Mon Sep 17 00:00:00 2001 From: Nikolai Zujev <824109+jaymecd@users.noreply.github.com> Date: Tue, 30 Apr 2024 17:59:33 +0200 Subject: [PATCH 1/6] fix(actions) - expose correct variable name for branch name --- .../pull-request/add-label-based-on-branch-name/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/github/pull-request/add-label-based-on-branch-name/action.yaml b/actions/github/pull-request/add-label-based-on-branch-name/action.yaml index ea2346c..e753ad1 100644 --- a/actions/github/pull-request/add-label-based-on-branch-name/action.yaml +++ b/actions/github/pull-request/add-label-based-on-branch-name/action.yaml @@ -35,7 +35,7 @@ runs: if (context.eventName == 'workflow_run') { core.exportVariable("PULL_REQUEST_NUMBER", context.payload.workflow_run.pull_requests[0].number); - core.exportVariable("PULL_REQUEST_NUMBER", context.payload.workflow_run.pull_requests[0].head.ref); + core.exportVariable("PULL_REQUEST_BRANCH_NAME", context.payload.workflow_run.pull_requests[0].head.ref); return; } From c2f6b4664c7dca13b47a886098b5acf0779a89a7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 22:43:39 +0000 Subject: [PATCH 2/6] github-actions(deps): bump ergebnis/.github from 1.9.0 to 1.9.1 Bumps [ergebnis/.github](https://github.com/ergebnis/.github) from 1.9.0 to 1.9.1. - [Release notes](https://github.com/ergebnis/.github/releases) - [Changelog](https://github.com/ergebnis/.github/blob/main/CHANGELOG.md) - [Commits](https://github.com/ergebnis/.github/compare/1.9.0...1.9.1) --- updated-dependencies: - dependency-name: ergebnis/.github dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/merge.yaml | 8 ++++---- .github/workflows/release.yaml | 2 +- .github/workflows/triage.yaml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml index e6ca8cd..f2634dd 100644 --- a/.github/workflows/merge.yaml +++ b/.github/workflows/merge.yaml @@ -26,23 +26,23 @@ jobs: steps: - name: "Request review from @ergebnis-bot" - uses: "ergebnis/.github/actions/github/pull-request/request-review@1.9.0" + uses: "ergebnis/.github/actions/github/pull-request/request-review@1.9.1" with: github-token: "${{ secrets.ERGEBNIS_BOT_TOKEN }}" reviewer: "ergebnis-bot" - name: "Assign @ergebnis-bot" - uses: "ergebnis/.github/actions/github/pull-request/add-assignee@1.9.0" + uses: "ergebnis/.github/actions/github/pull-request/add-assignee@1.9.1" with: assignee: "ergebnis-bot" github-token: "${{ secrets.ERGEBNIS_BOT_TOKEN }}" - name: "Approve pull request" - uses: "ergebnis/.github/actions/github/pull-request/approve@1.9.0" + uses: "ergebnis/.github/actions/github/pull-request/approve@1.9.1" with: github-token: "${{ secrets.ERGEBNIS_BOT_TOKEN }}" - name: "Merge pull request" - uses: "ergebnis/.github/actions/github/pull-request/merge@1.9.0" + uses: "ergebnis/.github/actions/github/pull-request/merge@1.9.1" with: github-token: "${{ secrets.ERGEBNIS_BOT_TOKEN }}" diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index dc949a5..b807454 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -17,6 +17,6 @@ jobs: steps: - name: "Create release" - uses: "ergebnis/.github/actions/github/release/create@1.9.0" + uses: "ergebnis/.github/actions/github/release/create@1.9.1" with: github-token: "${{ secrets.ERGEBNIS_BOT_TOKEN }}" diff --git a/.github/workflows/triage.yaml b/.github/workflows/triage.yaml index 9a2c630..f8f2198 100644 --- a/.github/workflows/triage.yaml +++ b/.github/workflows/triage.yaml @@ -17,6 +17,6 @@ jobs: steps: - name: "Add labels based on branch name" - uses: "ergebnis/.github/actions/github/pull-request/add-label-based-on-branch-name@1.9.0" + uses: "ergebnis/.github/actions/github/pull-request/add-label-based-on-branch-name@1.9.1" with: github-token: "${{ secrets.ERGEBNIS_BOT_TOKEN }}" From f529a1145f502e7e87c2a7c3a3d1487b399f9da4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 22:53:02 +0000 Subject: [PATCH 3/6] github-actions(deps): bump actions/checkout from 4.1.6 to 4.1.7 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.6 to 4.1.7. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.1.6...v4.1.7) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/integrate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 78c66df..11a23e1 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -18,7 +18,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v4.1.6" + uses: "actions/checkout@v4.1.7" - name: "Lint YAML files" uses: "ibiqlik/action-yamllint@v3.1.1" From fb04508f1cba0e5f5e962a575ca332e8425d830e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Sat, 15 Jun 2024 13:43:15 +0200 Subject: [PATCH 4/6] Fix: Update CHANGELOG.md and SECURITY.md --- .github/SECURITY.md | 4 ++-- CHANGELOG.md | 18 +++++++++++++++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.github/SECURITY.md b/.github/SECURITY.md index fa5e79f..9fef931 100644 --- a/.github/SECURITY.md +++ b/.github/SECURITY.md @@ -4,13 +4,13 @@ The following versions of `ergebnis/.github` have active support: -- `^1.9.0` +- `^1.9.1` ## Unsupported Versions The following versions of `ergebnis/.github` have reached their end of life: -- `<1.9.0` +- `<1.9.1` ## Reporting a Vulnerability diff --git a/CHANGELOG.md b/CHANGELOG.md index a1b196d..90e26ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## Unreleased -For a full diff see [`1.9.0...main`][1.9.0...main]. +For a full diff see [`1.9.1...main`][1.9.1...main]. + +## [`1.9.1`][1.9.1] + +For a full diff see [`1.9.0...1.9.1`][1.9.0...1.9.1]. + +### Fixed + +- Fixed invalid attempt to calculate cache key for `phars.xml` with `hashfiles()` function ([#197]), by [@lotyp] ## [`1.9.0`][1.9.0] @@ -148,7 +156,8 @@ For a full diff see [`1.0.0...main`][1.0.0...main]. [1.6.0]: https://github.com/ergebnis/.github/releases/tag/1.6.0 [1.7.0]: https://github.com/ergebnis/.github/releases/tag/1.7.0 [1.8.0]: https://github.com/ergebnis/.github/releases/tag/1.8.0 -[1.9.0]: https://github.com/ergebnis/.github/releases/tag/1.8.0 +[1.9.0]: https://github.com/ergebnis/.github/releases/tag/1.9.0 +[1.9.1]: https://github.com/ergebnis/.github/releases/tag/1.9.1 [ca7f15d...1.0.0]: https://github.com/ergebnis/.github/compare/ca7f15d...1.0.0 [1.0.0...1.1.0]: https://github.com/ergebnis/.github/compare/1.0.0...1.1.0 @@ -165,7 +174,8 @@ For a full diff see [`1.0.0...main`][1.0.0...main]. [1.6.0...1.7.0]: https://github.com/ergebnis/.github/compare/1.6.0...1.7.0 [1.7.0...1.8.0]: https://github.com/ergebnis/.github/compare/1.7.0...1.8.0 [1.8.0...1.9.0]: https://github.com/ergebnis/.github/compare/1.8.0...1.9.0 -[1.9.0...main]: https://github.com/ergebnis/.github/compare/1.9.0...main +[1.9.0...1.9.1]: https://github.com/ergebnis/.github/compare/1.9.0...1.9.1 +[1.9.1...main]: https://github.com/ergebnis/.github/compare/1.9.1...main [#47]: https://github.com/ergebnis/.github/pull/47 [#48]: https://github.com/ergebnis/.github/pull/48 @@ -187,5 +197,7 @@ For a full diff see [`1.0.0...main`][1.0.0...main]. [#124]: https://github.com/ergebnis/.github/pull/124 [#142]: https://github.com/ergebnis/.github/pull/142 [#183]: https://github.com/ergebnis/.github/pull/183 +[#197]: https://github.com/ergebnis/.github/pull/197 [@localheinz]: https://github.com/localheinz +[@lotyp]: https://github.com/lotyp From 94d8e5bb6489043647112bbc324fbc414b8f7c9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Sat, 15 Jun 2024 13:47:18 +0200 Subject: [PATCH 5/6] Fix: Update CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90e26ef..6395c28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), For a full diff see [`1.9.1...main`][1.9.1...main]. +### Fixed + +- Expose `PULL_REQUEST_BRANCH_NAME` instead of overwriting `PULL_REQUEST_NUMBER` environment variable when adding label based on branch name ([#194]), by [@jaymecd] + ## [`1.9.1`][1.9.1] For a full diff see [`1.9.0...1.9.1`][1.9.0...1.9.1]. @@ -197,7 +201,9 @@ For a full diff see [`1.0.0...main`][1.0.0...main]. [#124]: https://github.com/ergebnis/.github/pull/124 [#142]: https://github.com/ergebnis/.github/pull/142 [#183]: https://github.com/ergebnis/.github/pull/183 +[#194]: https://github.com/ergebnis/.github/pull/194 [#197]: https://github.com/ergebnis/.github/pull/197 +[@jaymecd]: https://github.com/jaymecd [@localheinz]: https://github.com/localheinz [@lotyp]: https://github.com/lotyp From 66eb779160e3d9602937916c45041e404129c411 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Sat, 15 Jun 2024 13:48:25 +0200 Subject: [PATCH 6/6] Enhancement: Prepare release --- .github/SECURITY.md | 4 ++-- CHANGELOG.md | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/SECURITY.md b/.github/SECURITY.md index 9fef931..43c4643 100644 --- a/.github/SECURITY.md +++ b/.github/SECURITY.md @@ -4,13 +4,13 @@ The following versions of `ergebnis/.github` have active support: -- `^1.9.1` +- `^1.9.2` ## Unsupported Versions The following versions of `ergebnis/.github` have reached their end of life: -- `<1.9.1` +- `<1.9.2` ## Reporting a Vulnerability diff --git a/CHANGELOG.md b/CHANGELOG.md index 6395c28..fc124cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## Unreleased -For a full diff see [`1.9.1...main`][1.9.1...main]. +For a full diff see [`1.9.2...main`][1.9.2...main]. + +## [`1.9.2`][1.9.2] + +For a full diff see [`1.9.1...1.9.2`][1.9.1...1.9.2]. ### Fixed @@ -162,6 +166,7 @@ For a full diff see [`1.0.0...main`][1.0.0...main]. [1.8.0]: https://github.com/ergebnis/.github/releases/tag/1.8.0 [1.9.0]: https://github.com/ergebnis/.github/releases/tag/1.9.0 [1.9.1]: https://github.com/ergebnis/.github/releases/tag/1.9.1 +[1.9.2]: https://github.com/ergebnis/.github/releases/tag/1.9.2 [ca7f15d...1.0.0]: https://github.com/ergebnis/.github/compare/ca7f15d...1.0.0 [1.0.0...1.1.0]: https://github.com/ergebnis/.github/compare/1.0.0...1.1.0 @@ -179,7 +184,8 @@ For a full diff see [`1.0.0...main`][1.0.0...main]. [1.7.0...1.8.0]: https://github.com/ergebnis/.github/compare/1.7.0...1.8.0 [1.8.0...1.9.0]: https://github.com/ergebnis/.github/compare/1.8.0...1.9.0 [1.9.0...1.9.1]: https://github.com/ergebnis/.github/compare/1.9.0...1.9.1 -[1.9.1...main]: https://github.com/ergebnis/.github/compare/1.9.1...main +[1.9.1...1.9.2]: https://github.com/ergebnis/.github/compare/1.9.1...1.9.2 +[1.9.2...main]: https://github.com/ergebnis/.github/compare/1.9.2...main [#47]: https://github.com/ergebnis/.github/pull/47 [#48]: https://github.com/ergebnis/.github/pull/48