Skip to content

Commit e2137f3

Browse files
susnuxsusnux
authored
Merge pull request #1930 from nextcloud-libraries/dependabot/npm_and_yarn/jsdom-27.1.0
chore(deps-dev): Bump jsdom from 27.0.0 to 27.1.0
2 parents 49f1503 + 579def9 commit e2137f3

12 files changed

Lines changed: 155 additions & 307 deletions

‎.github/workflows/block-unconventional-commits.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This workflow is provided via the organization template repository
22
#
3-
# https://github.com/nextcloud/.github
3+
# https://github.com/nextcloud-libraries/.github
44
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
55
#
66
# SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors

‎.github/workflows/changelog-generate.yml‎

Lines changed: 0 additions & 69 deletions
This file was deleted.

‎.github/workflows/cypress.yml‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This workflow is provided via the organization template repository
22
#
3-
# https://github.com/nextcloud/.github
3+
# https://github.com/nextcloud-libraries/.github
44
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
55
#
66
# SPDX-FileCopyrightText: 2023-2024 Nextcloud GmbH and Nextcloud contributors
@@ -31,9 +31,6 @@ permissions:
3131
jobs:
3232
init:
3333
runs-on: ubuntu-latest
34-
outputs:
35-
nodeVersion: ${{ steps.versions.outputs.nodeVersion }}
36-
npmVersion: ${{ steps.versions.outputs.npmVersion }}
3734

3835
env:
3936
PUPPETEER_SKIP_DOWNLOAD: true
@@ -54,34 +51,31 @@ jobs:
5451
id: check_composer
5552
uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3.0.0
5653
with:
57-
files: "composer.json"
54+
files: 'composer.json'
5855

5956
- name: Install composer dependencies
6057
if: steps.check_composer.outputs.files_exists == 'true'
6158
run: composer install --no-dev
6259

63-
- name: Read package.json node and npm engines version
64-
uses: skjnldsv/read-package-engines-version-actions@06d6baf7d8f41934ab630e97d9e6c0bc9c9ac5e4 # v3
60+
- name: Read package.json
61+
uses: nextcloud-libraries/parse-package-engines-action@122ae05d4257008180a514e1ddeb0c1b9d094bdd # v0.1.0
6562
id: versions
66-
with:
67-
fallbackNode: "^20"
68-
fallbackNpm: "^10"
6963

70-
- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
64+
- name: Set up node
7165
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
7266
with:
73-
node-version: ${{ steps.versions.outputs.nodeVersion }}
67+
node-version: ${{ steps.versions.outputs.node-version }}
7468

75-
- name: Set up npm ${{ steps.versions.outputs.npmVersion }}
76-
run: npm i -g 'npm@${{ steps.versions.outputs.npmVersion }}'
69+
- name: Set up npm
70+
run: npm i -g 'npm@${{ steps.versions.outputs.package-manager-version }}'
7771

7872
- name: Install node dependencies & build app
7973
run: |
8074
npm ci
8175
TESTING=true npm run build --if-present
8276
8377
- name: Save context
84-
uses: buildjet/cache/save@v4
78+
uses: buildjet/cache/save@3e70d19e31d6a8030aeddf6ed8dbe601f94d09f4 # v4.0.2
8579
with:
8680
key: cypress-context-${{ github.run_id }}
8781
path: ./
@@ -101,22 +95,26 @@ jobs:
10195

10296
steps:
10397
- name: Restore context
104-
uses: buildjet/cache/restore@v4
98+
uses: buildjet/cache/restore@3e70d19e31d6a8030aeddf6ed8dbe601f94d09f4 # v4.0.2
10599
with:
106100
fail-on-cache-miss: true
107101
key: cypress-context-${{ github.run_id }}
108102
path: ./
109103

110-
- name: Set up node ${{ needs.init.outputs.nodeVersion }}
104+
- name: Read package.json
105+
uses: nextcloud-libraries/parse-package-engines-action@122ae05d4257008180a514e1ddeb0c1b9d094bdd # v0.1.0
106+
id: versions
107+
108+
- name: Set up node
111109
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
112110
with:
113-
node-version: ${{ needs.init.outputs.nodeVersion }}
111+
node-version: ${{ steps.versions.outputs.node-version }}
114112

115-
- name: Set up npm ${{ needs.init.outputs.npmVersion }}
116-
run: npm i -g 'npm@${{ needs.init.outputs.npmVersion }}'
113+
- name: Set up npm
114+
run: npm i -g 'npm@${{ steps.versions.outputs.package-manager-version }}'
117115

118116
- name: Run ${{ startsWith(matrix.containers, 'component') && 'component' || 'E2E' }} cypress tests
119-
uses: cypress-io/github-action@e65cba2e7319696fc0fdc4d5a319b737aec4ba1c # v6.10.3
117+
uses: cypress-io/github-action@7ef72e250a9e564efb4ed4c2433971ada4cc38b4 # v6.10.4
120118
with:
121119
record: ${{ secrets.CYPRESS_RECORD_KEY && true }}
122120
parallel: ${{ secrets.CYPRESS_RECORD_KEY && true }}

‎.github/workflows/dependabot-approve-merge.yml‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# This workflow is provided via the organization template repository
22
#
3-
# https://github.com/nextcloud/.github
3+
# https://github.com/nextcloud-libraries/.github
44
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
55
#
6-
# SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
6+
# SPDX-FileCopyrightText: Nextcloud GmbH and Nextcloud contributors
77
# SPDX-License-Identifier: MIT
88

9-
name: Dependabot
9+
name: Auto approve Dependabot PRs
1010

1111
on:
1212
pull_request_target: # zizmor: ignore[dangerous-triggers]
@@ -29,6 +29,8 @@ jobs:
2929
permissions:
3030
# for hmarr/auto-approve-action to approve PRs
3131
pull-requests: write
32+
# for alexwilson/enable-github-automerge-action to approve PRs
33+
contents: write
3234

3335
steps:
3436
- name: Disabled on forks
@@ -37,13 +39,20 @@ jobs:
3739
echo 'Can not approve PRs from forks'
3840
exit 1
3941
42+
- uses: mdecoleman/pr-branch-name@55795d86b4566d300d237883103f052125cc7508 # v3.0.0
43+
id: branchname
44+
with:
45+
repo-token: ${{ secrets.GITHUB_TOKEN }}
46+
4047
# GitHub actions bot approve
41-
- uses: hmarr/auto-approve-action@b40d6c9ed2fa10c9a2749eca7eb004418a705501 # v2
48+
- uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0
49+
if: startsWith(steps.branchname.outputs.branch, 'dependabot/')
4250
with:
4351
github-token: ${{ secrets.GITHUB_TOKEN }}
4452

45-
# Nextcloud bot approve and merge request
46-
- uses: ahmadnassri/action-dependabot-auto-merge@45fc124d949b19b6b8bf6645b6c9d55f4f9ac61a # v2
53+
# Enable GitHub auto merge
54+
- name: Auto merge
55+
uses: alexwilson/enable-github-automerge-action@56e3117d1ae1540309dc8f7a9f2825bc3c5f06ff # v2.0.0
56+
if: startsWith(steps.branchname.outputs.branch, 'dependabot/')
4757
with:
48-
target: minor
49-
github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }}
58+
github-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/documentation.yml‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This workflow is provided via the organization template repository
22
#
3-
# https://github.com/nextcloud/.github
3+
# https://github.com/nextcloud-libraries/.github
44
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
55
#
66
# SPDX-FileCopyrightText: 2023-2024 Nextcloud GmbH and Nextcloud contributors
@@ -14,40 +14,30 @@ on:
1414
types: [published]
1515

1616
permissions:
17-
contents: read
17+
contents: write
1818

1919
jobs:
2020
build-and-deploy:
2121
runs-on: ubuntu-latest
2222

2323
name: Build and deploy
2424
steps:
25-
- name: Check actor permission level
26-
# Only allow admin to deploy on release
27-
if: github.event.release
28-
uses: skjnldsv/check-actor-permission@69e92a3c4711150929bca9fcf34448c5bf5526e7 # v2
29-
with:
30-
require: write
31-
3225
- name: Checkout
3326
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3427
with:
3528
persist-credentials: false
3629

37-
- name: Read package.json node and npm engines version
38-
uses: skjnldsv/read-package-engines-version-actions@06d6baf7d8f41934ab630e97d9e6c0bc9c9ac5e4 # v3
30+
- name: Read package.json
31+
uses: nextcloud-libraries/parse-package-engines-action@122ae05d4257008180a514e1ddeb0c1b9d094bdd # v0.1.0
3932
id: versions
40-
with:
41-
fallbackNode: '^20'
42-
fallbackNpm: '^10'
4333

44-
- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
34+
- name: Set up node
4535
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
4636
with:
47-
node-version: ${{ steps.versions.outputs.nodeVersion }}
37+
node-version: ${{ steps.versions.outputs.node-version }}
4838

49-
- name: Set up npm ${{ steps.versions.outputs.npmVersion }}
50-
run: npm i -g 'npm@${{ steps.versions.outputs.npmVersion }}'
39+
- name: Set up npm
40+
run: npm i -g 'npm@${{ steps.versions.outputs.package-manager-version }}'
5141

5242
- name: Install dependencies & build
5343
env:

‎.github/workflows/fixup.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This workflow is provided via the organization template repository
22
#
3-
# https://github.com/nextcloud/.github
3+
# https://github.com/nextcloud-libraries/.github
44
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
55
#
66
# SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors

‎.github/workflows/l10n.yml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,24 @@ jobs:
1717
with:
1818
persist-credentials: false
1919

20-
- name: Read package.json node and npm engines version
21-
uses: skjnldsv/read-package-engines-version-actions@v3
20+
- name: Read package.json
21+
uses: nextcloud-libraries/parse-package-engines-action@122ae05d4257008180a514e1ddeb0c1b9d094bdd # v0.1.0
2222
id: versions
23-
with:
24-
fallbackNode: '^20'
25-
fallbackNpm: '^10'
2623

27-
- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
24+
- name: Set up node
2825
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
2926
with:
30-
node-version: ${{ steps.versions.outputs.nodeVersion }}
27+
node-version: ${{ steps.versions.outputs.node-version }}
3128

32-
- name: Set up npm ${{ steps.versions.outputs.npmVersion }}
33-
run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
29+
- name: Set up npm
30+
run: npm i -g 'npm@${{ steps.versions.outputs.package-manager-version }}'
3431

35-
- name: Install dependencies
36-
run: npm ci
32+
- name: Install dependencies & build
33+
env:
34+
CYPRESS_INSTALL_BINARY: 0
35+
run: |
36+
npm ci
37+
npm run build --if-present
3738
3839
- name: Extract l10n files
3940
run: npm run l10n:extract

0 commit comments

Comments
 (0)