From 283b4a555d45de62c876bda863e3640049281349 Mon Sep 17 00:00:00 2001 From: Daniel O'Grady Date: Tue, 7 Jan 2025 10:13:04 +0100 Subject: [PATCH 1/3] Merge workflow jobs --- .../workflows/dependabot-skip-changelog.yml | 32 ------------------- .github/workflows/enforce-changelog.yml | 27 +++++++++++++++- 2 files changed, 26 insertions(+), 33 deletions(-) delete mode 100644 .github/workflows/dependabot-skip-changelog.yml diff --git a/.github/workflows/dependabot-skip-changelog.yml b/.github/workflows/dependabot-skip-changelog.yml deleted file mode 100644 index 12b516e3..00000000 --- a/.github/workflows/dependabot-skip-changelog.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: Label Dependabot PRs - -on: - pull_request: - types: [opened] - -jobs: - label_dependabot: - runs-on: ubuntu-latest - permissions: - pull-requests: write - steps: - - name: Check if PR is by Dependabot - uses: actions/github-script@v7 - with: - script: | - const prAuthor = context.payload.pull_request.user.login; - const prNumber = context.payload.pull_request.number; - const repoOwner = context.repo.owner; - const repoName = context.repo.repo; - - if (prAuthor === 'dependabot[bot]' || prAuthor === 'dependabot') { - core.info(`PR #${prNumber} is authored by Dependabot. Adding label...`); - await github.rest.issues.addLabels({ - owner: repoOwner, - repo: repoName, - issue_number: prNumber, - labels: ['skip changelog'] - }); - } else { - core.info(`PR #${prNumber} is not authored by Dependabot. No action taken.`); - } diff --git a/.github/workflows/enforce-changelog.yml b/.github/workflows/enforce-changelog.yml index f04a7bb6..64027bd2 100644 --- a/.github/workflows/enforce-changelog.yml +++ b/.github/workflows/enforce-changelog.yml @@ -1,9 +1,34 @@ -name: "Enforce Changelog" +name: Enforce Changelog on: pull_request: types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled] jobs: + label_dependabot: + runs-on: ubuntu-latest + permissions: + pull-requests: write + steps: + - name: Check if PR is by Dependabot + uses: actions/github-script@v7 + with: + script: | + const prAuthor = context.payload.pull_request.user.login; + const prNumber = context.payload.pull_request.number; + const repoOwner = context.repo.owner; + const repoName = context.repo.repo; + + if (prAuthor === 'dependabot[bot]' || prAuthor === 'dependabot') { + core.info(`PR #${prNumber} is authored by Dependabot. Adding label...`); + await github.rest.issues.addLabels({ + owner: repoOwner, + repo: repoName, + issue_number: prNumber, + labels: ['skip changelog'] + }); + } else { + core.info(`PR #${prNumber} is not authored by Dependabot. No action taken.`); + } changelog: runs-on: ubuntu-latest steps: From 726abb02b42b57509778fea32a4e765ca7636a5a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 10:15:17 +0100 Subject: [PATCH 2/3] Bump globals from 15.13.0 to 15.14.0 (#449) Bumps [globals](https://github.com/sindresorhus/globals) from 15.13.0 to 15.14.0.
Release notes

Sourced from globals's releases.

v15.14.0

  • Add vitest globals (#274) 06a5723

https://github.com/sindresorhus/globals/compare/v15.13.0...v15.14.0

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=globals&package-manager=npm_and_yarn&previous-version=15.13.0&new-version=15.14.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 293a2994..3a0d0691 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3234,11 +3234,10 @@ } }, "node_modules/globals": { - "version": "15.13.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-15.13.0.tgz", - "integrity": "sha512-49TewVEz0UxZjr1WYYsWpPrhyC/B/pA8Bq0fUmet2n+eR7yn0IvNzNaoBwnK6mdkzcN+se7Ez9zUgULTz2QH4g==", + "version": "15.14.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-15.14.0.tgz", + "integrity": "sha512-OkToC372DtlQeje9/zHIo5CT8lRP/FUgEOKBEhU4e0abL7J7CD24fD9ohiLN5hagG/kWCYj4K5oaxxtj2Z0Dig==", "dev": true, - "license": "MIT", "engines": { "node": ">=18" }, From 00c2bf68ab485580b2abeac79016c70837c78ac5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 10:19:58 +0100 Subject: [PATCH 3/3] Bump @sap/cds from 8.5.1 to 8.6.0 (#450) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Daniel O'Grady <103028279+daogrady@users.noreply.github.com> --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3a0d0691..69dea0a6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1344,9 +1344,9 @@ } }, "node_modules/@sap/cds": { - "version": "8.5.1", - "resolved": "https://registry.npmjs.org/@sap/cds/-/cds-8.5.1.tgz", - "integrity": "sha512-uOja4rkv37GstTndj4PpXLjPoX7AkGy9oNCO9mMT1tyJYo7gfoVuJY5fmE50xegqDrHgKI2aMQu9kDyKGEQ/4A==", + "version": "8.6.0", + "resolved": "https://registry.npmjs.org/@sap/cds/-/cds-8.6.0.tgz", + "integrity": "sha512-MagthrcmAa1l+nAtx/4gMnDv9scfkIwXPFQT7N8+dLU0u1DitLePA5nYk9M62wHZy79mE1tPwxdoLS2NdMzQQw==", "dev": true, "dependencies": { "@sap/cds-compiler": ">=5.1",