From 08212f2bad7c8f74275aa4d9664dd18c3777c821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Thu, 19 May 2022 17:41:21 +0200 Subject: [PATCH 01/11] Fix: Description --- .github/settings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/settings.yml b/.github/settings.yml index fee26bd..5ec4346 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -65,7 +65,7 @@ repository: archived: false default_branch: "main" delete_branch_on_merge: true - description: ":heart: Provides default community health files for the @ergebnis organization." + description: ":heart: Provides default community health files and composite actions for the @ergebnis organization." has_downloads: false has_issues: false has_pages: false @@ -76,4 +76,4 @@ repository: # https://docs.github.com/en/rest/reference/repos#replace-all-repository-topics - topics: "default, community, health, files" + topics: "default, community, health, files, composite, actions" From c80fd8e756651c62f26356540ee413127ae12326 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Thu, 19 May 2022 17:49:03 +0200 Subject: [PATCH 02/11] Enhancement: Let dependabot update dependencies in composite actions --- .github/dependabot.yml | 66 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f7872ee..9dc98f8 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -13,3 +13,69 @@ updates: package-ecosystem: "github-actions" schedule: interval: "daily" + + - commit-message: + include: "scope" + prefix: "github-actions" + directory: "/actions/github/pull-request/add-assignee" + labels: + - "dependency" + open-pull-requests-limit: 10 + package-ecosystem: "github-actions" + schedule: + interval: "daily" + + - commit-message: + include: "scope" + prefix: "github-actions" + directory: "/actions/github/pull-request/add-label-based-on-branch-name" + labels: + - "dependency" + open-pull-requests-limit: 10 + package-ecosystem: "github-actions" + schedule: + interval: "daily" + + - commit-message: + include: "scope" + prefix: "github-actions" + directory: "/actions/github/pull-request/approve" + labels: + - "dependency" + open-pull-requests-limit: 10 + package-ecosystem: "github-actions" + schedule: + interval: "daily" + + - commit-message: + include: "scope" + prefix: "github-actions" + directory: "/actions/github/pull-request/merge" + labels: + - "dependency" + open-pull-requests-limit: 10 + package-ecosystem: "github-actions" + schedule: + interval: "daily" + + - commit-message: + include: "scope" + prefix: "github-actions" + directory: "/actions/github/pull-request/request-review" + labels: + - "dependency" + open-pull-requests-limit: 10 + package-ecosystem: "github-actions" + schedule: + interval: "daily" + + - commit-message: + include: "scope" + prefix: "github-actions" + directory: "/actions/github/release/create" + labels: + - "dependency" + open-pull-requests-limit: 10 + package-ecosystem: "github-actions" + schedule: + interval: "daily" From 17101f35617f743fbd8932665b58137daca5baf7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 May 2022 15:51:36 +0000 Subject: [PATCH 03/11] github-actions(deps): bump ergebnis/.github from 1.4.1 to 1.5.0 Bumps ergebnis/.github from 1.4.1 to 1.5.0. --- updated-dependencies: - dependency-name: ergebnis/.github dependency-type: direct:production update-type: version-update:semver-minor ... 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 72bca86..2eabbf9 100644 --- a/.github/workflows/merge.yaml +++ b/.github/workflows/merge.yaml @@ -24,23 +24,23 @@ jobs: steps: - name: "Request review from @ergebnis-bot" - uses: "ergebnis/.github/actions/github/pull-request/request-review@1.4.1" + uses: "ergebnis/.github/actions/github/pull-request/request-review@1.5.0" with: github-token: "${{ secrets.ERGEBNIS_BOT_TOKEN }}" reviewer: "ergebnis-bot" - name: "Assign @ergebnis-bot" - uses: "ergebnis/.github/actions/github/pull-request/add-assignee@1.4.1" + uses: "ergebnis/.github/actions/github/pull-request/add-assignee@1.5.0" with: github-token: "${{ secrets.ERGEBNIS_BOT_TOKEN }}" assignee: "ergebnis-bot" - name: "Approve pull request" - uses: "ergebnis/.github/actions/github/pull-request/approve@1.4.1" + uses: "ergebnis/.github/actions/github/pull-request/approve@1.5.0" with: github-token: "${{ secrets.ERGEBNIS_BOT_TOKEN }}" - name: "Merge pull request" - uses: "ergebnis/.github/actions/github/pull-request/merge@1.4.1" + uses: "ergebnis/.github/actions/github/pull-request/merge@1.5.0" with: github-token: "${{ secrets.ERGEBNIS_BOT_TOKEN }}" diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b858858..3c9e23a 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -15,6 +15,6 @@ jobs: steps: - name: "Create release" - uses: "ergebnis/.github/actions/github/release/create@1.4.1" + uses: "ergebnis/.github/actions/github/release/create@1.5.0" with: github-token: "${{ secrets.ERGEBNIS_BOT_TOKEN }}" diff --git a/.github/workflows/triage.yaml b/.github/workflows/triage.yaml index 791c1dd..32959ca 100644 --- a/.github/workflows/triage.yaml +++ b/.github/workflows/triage.yaml @@ -15,6 +15,6 @@ jobs: steps: - name: "Add labels based on branch name" - uses: "ergebnis/.github/actions/github/pull-request/add-label-based-on-branch-name@1.4.1" + uses: "ergebnis/.github/actions/github/pull-request/add-label-based-on-branch-name@1.5.0" with: github-token: "${{ secrets.ERGEBNIS_BOT_TOKEN }}" From 11ad677bbe322e6fa68fe9a68cfb3c88a8550c45 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 May 2022 15:51:37 +0000 Subject: [PATCH 04/11] github-actions(deps): bump actions/github-script Bumps [actions/github-script](https://github.com/actions/github-script) from 6.0.0 to 6.1.0. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/v6.0.0...v6.1.0) --- updated-dependencies: - dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- actions/github/pull-request/request-review/action.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/actions/github/pull-request/request-review/action.yaml b/actions/github/pull-request/request-review/action.yaml index 64ffb22..59fb11f 100644 --- a/actions/github/pull-request/request-review/action.yaml +++ b/actions/github/pull-request/request-review/action.yaml @@ -22,7 +22,7 @@ runs: steps: - name: "Determine pull request number" - uses: "actions/github-script@v6.0.0" + uses: "actions/github-script@v6.1.0" with: github-token: "${{ inputs.github-token }}" script: | @@ -44,7 +44,7 @@ runs: core.setFailed(`Unable to determine the pull request number for event "${context.eventName}"`); - name: "Request reviewer" - uses: "actions/github-script@v6.0.0" + uses: "actions/github-script@v6.1.0" env: REVIEWER: "${{ inputs.reviewer }}" with: From 1c109c565e37bcc11353a3ceae64960ecbec6844 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 May 2022 15:51:37 +0000 Subject: [PATCH 05/11] github-actions(deps): bump actions/github-script Bumps [actions/github-script](https://github.com/actions/github-script) from 6.0.0 to 6.1.0. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/v6.0.0...v6.1.0) --- updated-dependencies: - dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- actions/github/pull-request/add-assignee/action.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/actions/github/pull-request/add-assignee/action.yaml b/actions/github/pull-request/add-assignee/action.yaml index 9faf8fc..cf43da5 100644 --- a/actions/github/pull-request/add-assignee/action.yaml +++ b/actions/github/pull-request/add-assignee/action.yaml @@ -22,7 +22,7 @@ runs: steps: - name: "Determine pull request number" - uses: "actions/github-script@v6.0.0" + uses: "actions/github-script@v6.1.0" with: github-token: "${{ inputs.github-token }}" script: | @@ -44,7 +44,7 @@ runs: core.setFailed(`Unable to determine the pull request number for event "${context.eventName}"`); - name: "Add assignee to pull request" - uses: "actions/github-script@v6.0.0" + uses: "actions/github-script@v6.1.0" env: ASSIGNEE: "${{ inputs.assignee }}" with: From fa377f7a10cfe2c836e8d7a7f36b20398d61e1bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 May 2022 15:51:37 +0000 Subject: [PATCH 06/11] github-actions(deps): bump actions/github-script Bumps [actions/github-script](https://github.com/actions/github-script) from 6.0.0 to 6.1.0. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/v6.0.0...v6.1.0) --- updated-dependencies: - dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- actions/github/pull-request/approve/action.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/actions/github/pull-request/approve/action.yaml b/actions/github/pull-request/approve/action.yaml index 48c2df0..2da4ac3 100644 --- a/actions/github/pull-request/approve/action.yaml +++ b/actions/github/pull-request/approve/action.yaml @@ -19,7 +19,7 @@ runs: steps: - name: "Determine pull request number" - uses: "actions/github-script@v6.0.0" + uses: "actions/github-script@v6.1.0" with: github-token: "${{ inputs.github-token }}" script: | @@ -41,7 +41,7 @@ runs: core.setFailed(`Unable to determine the pull request number for event "${context.eventName}"`); - name: "Approve pull request" - uses: "actions/github-script@v6.0.0" + uses: "actions/github-script@v6.1.0" with: github-token: "${{ inputs.github-token }}" script: | From bb0fb453653708d0cf2f7d6b514ae491871abd90 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 May 2022 15:51:39 +0000 Subject: [PATCH 07/11] github-actions(deps): bump actions/github-script Bumps [actions/github-script](https://github.com/actions/github-script) from 6.0.0 to 6.1.0. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/v6.0.0...v6.1.0) --- updated-dependencies: - dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- actions/github/release/create/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/github/release/create/action.yaml b/actions/github/release/create/action.yaml index 5b386be..b280315 100644 --- a/actions/github/release/create/action.yaml +++ b/actions/github/release/create/action.yaml @@ -23,7 +23,7 @@ runs: shell: "bash" - name: "Create release" - uses: "actions/github-script@v6.0.0" + uses: "actions/github-script@v6.1.0" with: github-token: "${{ inputs.github-token }}" script: | From dd159fc5b06d2564991b31a5b59940cfe3909e34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 May 2022 15:51:44 +0000 Subject: [PATCH 08/11] github-actions(deps): bump actions/github-script Bumps [actions/github-script](https://github.com/actions/github-script) from 6.0.0 to 6.1.0. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/v6.0.0...v6.1.0) --- updated-dependencies: - dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- actions/github/pull-request/merge/action.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/actions/github/pull-request/merge/action.yaml b/actions/github/pull-request/merge/action.yaml index e242d00..f825ac2 100644 --- a/actions/github/pull-request/merge/action.yaml +++ b/actions/github/pull-request/merge/action.yaml @@ -23,7 +23,7 @@ runs: steps: - name: "Determine pull request number" - uses: "actions/github-script@v6.0.0" + uses: "actions/github-script@v6.1.0" with: github-token: "${{ inputs.github-token }}" script: | @@ -45,7 +45,7 @@ runs: core.setFailed(`Unable to determine the pull request number for event "${context.eventName}"`); - name: "Merge pull request" - uses: "actions/github-script@v6.0.0" + uses: "actions/github-script@v6.1.0" env: MERGE_METHOD: "${{ inputs.merge-method }}" with: From 8ab0c2e16d5b6b63812b1827d0bf3fedbf49787b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 May 2022 15:51:48 +0000 Subject: [PATCH 09/11] github-actions(deps): bump actions/github-script Bumps [actions/github-script](https://github.com/actions/github-script) from 6.0.0 to 6.1.0. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/v6.0.0...v6.1.0) --- updated-dependencies: - dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../pull-request/add-label-based-on-branch-name/action.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 d6439c2..74f120e 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 @@ -19,7 +19,7 @@ runs: steps: - name: "Determine pull request number" - uses: "actions/github-script@v6.0.0" + uses: "actions/github-script@v6.1.0" with: github-token: "${{ inputs.github-token }}" script: | @@ -43,7 +43,7 @@ runs: core.setFailed(`Unable to determine the pull request number and branch name for event "${context.eventName}"`); - name: "Add label to pull request based on branch name" - uses: "actions/github-script@v6.0.0" + uses: "actions/github-script@v6.1.0" with: github-token: "${{ inputs.github-token }}" script: | From ad9e0939fc1ca80b8de4e7f4f102e834f3d17f63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Wed, 25 May 2022 08:19:10 +0200 Subject: [PATCH 10/11] Enhancement: Add @ergebnis to FUNDING.yml --- FUNDING.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/FUNDING.yml b/FUNDING.yml index 66085dc..4c8ee87 100644 --- a/FUNDING.yml +++ b/FUNDING.yml @@ -1 +1,3 @@ -github: "localheinz" +github: + - "ergebnis" + - "localheinz" From 912305103b3b019381597a7144524f970c82c4af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Tue, 12 Jul 2022 10:30:01 +0200 Subject: [PATCH 11/11] Fix: Condition --- CHANGELOG.md | 13 ++++++++++++- .../add-label-based-on-branch-name/action.yaml | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa99848..9f64502 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), For a full diff see [`1.5.0...main`][1.5.0...main]. +## [`1.5.1`][1.5.1] + +For a full diff see [`1.5.0...1.5.1`][1.5.0...1.5.1]. + +### Added + +- Fixed a condition in `github/pull-request/add-label-based-on-branch-name` ([#96]), by [@localheinz] + ## [`1.5.0`][1.5.0] For a full diff see [`1.4.1...1.5.0`][1.4.1...1.5.0]. @@ -104,6 +112,7 @@ For a full diff see [`1.0.0...main`][1.0.0...main]. [1.4.0]: https://github.com/ergebnis/.github/releases/tag/1.4.0 [1.4.1]: https://github.com/ergebnis/.github/releases/tag/1.4.1 [1.5.0]: https://github.com/ergebnis/.github/releases/tag/1.5.0 +[1.5.1]: https://github.com/ergebnis/.github/releases/tag/1.5.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 @@ -115,7 +124,8 @@ For a full diff see [`1.0.0...main`][1.0.0...main]. [1.3.2...1.4.0]: https://github.com/ergebnis/.github/compare/1.3.2...1.4.0 [1.4.0...1.4.1]: https://github.com/ergebnis/.github/compare/1.4.0...1.4.1 [1.4.1...1.5.0]: https://github.com/ergebnis/.github/compare/1.4.1...1.5.0 -[1.5.0...main]: https://github.com/ergebnis/.github/compare/1.5.0...main +[1.5.0...1.5.1]: https://github.com/ergebnis/.github/compare/1.5.0...1.5.1 +[1.5.0...main]: https://github.com/ergebnis/.github/compare/1.5.1...main [#47]: https://github.com/ergebnis/.github/pull/47 [#48]: https://github.com/ergebnis/.github/pull/48 @@ -132,5 +142,6 @@ For a full diff see [`1.0.0...main`][1.0.0...main]. [#80]: https://github.com/ergebnis/.github/pull/80 [#82]: https://github.com/ergebnis/.github/pull/82 [#87]: https://github.com/ergebnis/.github/pull/87 +[#96]: https://github.com/ergebnis/.github/pull/96 [@localheinz]: https://github.com/localheinz 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 74f120e..4fa502a 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 @@ -66,7 +66,7 @@ runs: const matches = process.env.PULL_REQUEST_BRANCH_NAME.match(new RegExp('^([^/]+)\/')); - if (!matches instanceof Array) { + if (!Array.isArray(matches)) { return; }