Skip to content

Commit 2a0d415

Browse files
nickvergessennickvergessen
authored
Merge pull request #1038 from nextcloud/automated/noid/stable34-update-workflows
[stable34] ci(actions): Update workflow templates from organization template repository
2 parents c378b17 + abc0edf commit 2a0d415

8 files changed

Lines changed: 63 additions & 26 deletions

‎.github/actions-lock.txt‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
# SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
22
# SPDX-License-Identifier: MIT
3-
c5ce8fbd4caa30c89fb31be5a9aeb25d appstore-build-publish.yml
4-
003108ea0f5c12e1db591cd4613304d8 dependabot-approve-merge.yml
3+
d4697182231bf364a34d8dd8b9e52a00 appstore-build-publish.yml
4+
e6351c608939c31ae1e32923aa82aa10 dependabot-approve-merge.yml
55
2581a67c5bcdcd570427e6d51db767d7 fixup.yml
6-
784303cf47612e5c4eac621dfab5b4f4 lint-info-xml.yml
7-
bb17aa6898f48f4caa83922c343731dc lint-php-cs.yml
8-
70673e479df96e3e71fe966cb07c82fa lint-php.yml
9-
883b4be7752bdbc342b6dbf7794dc378 phpunit-mariadb.yml
10-
52f8aa335a0a3ca1eeee7380854ff5ad phpunit-mysql.yml
11-
69b6d61696a328b8a17ad4aa6cb2a059 phpunit-oci.yml
12-
8e00d464a8ef10740b95dc2132244626 phpunit-pgsql.yml
13-
a7ae3a2b7529b41dae1302420eb72454 phpunit-sqlite.yml
6+
c5893d7af1998af66d22f8c171ff4448 lint-info-xml.yml
7+
870b483dbcbca59479211270d61546dd lint-php-cs.yml
8+
ee2b04d185b82fe7dd6fe6d83c6c7b45 lint-php.yml
9+
8cdb2530228c6e32c4a77ae012873f46 phpunit-mariadb.yml
10+
07e60b2f304c749ee563f1256caf2793 phpunit-mysql.yml
11+
b98798d397dd45f12c777038d230509e phpunit-oci.yml
12+
4bf29a4d193f83443d16d368c60a7870 phpunit-pgsql.yml
13+
21244b02c3f1ad7d78951ba1b876638f phpunit-sqlite.yml
1414
3c4a096b3b7dbaef0f8e5190ffe13518 pr-feedback.yml
15-
a6e484812c25ced8bb714182656e0ab1 psalm.yml
16-
e2bd0fc8a290e1a8641487944e27103b reuse.yml
17-
e3c7b8f43850ad1d31c67fc0082b6bb8 sync-workflow-templates.yml
15+
20b5d0d45766e3793f19c9c0c8d05140 psalm.yml
16+
3975dc58817119d596a8f6ed190352ce reuse.yml
17+
9799b1a6a842b5c0076b76de651a0e0d sync-workflow-templates.yml
1818
a3440826636c0fd7c2d20b1de50363da update-nextcloud-ocp-approve-merge.yml
19-
eb943a065c2a0711c14468fa76629eae update-nextcloud-ocp.yml
19+
39db87018db395caf41007931817cdbd update-nextcloud-ocp.yml
2020
22604c31b526de270a080eb19967a638 update-stable-titles.yml

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

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@ jobs:
2626
auto-approve-merge:
2727
if: github.event.pull_request.user.login == 'dependabot[bot]'
2828
runs-on: ubuntu-latest-low
29+
env:
30+
# env variable for maintainers: 'true' allows to auto-merge 1.0.2 -> 2.0.0
31+
ALLOW_MAJOR: false
32+
# env variable for maintainers: 'true' allows to auto-merge 1.0.2 -> 1.1.0
33+
ALLOW_MINOR: true
34+
# env variable for maintainers: RegExp string to ignore some dependencies from auto-approve and auto-merge
35+
IGNORE_PATTERN: ''
2936
permissions:
3037
# for auto-approve step to work
3138
pull-requests: write
@@ -46,12 +53,32 @@ jobs:
4653

4754
- name: Dependabot metadata
4855
id: metadata
56+
if: startsWith(steps.branchname.outputs.branch, 'dependabot/')
4957
uses: dependabot/fetch-metadata@25dd0e34f4fe68f24cc83900b1fe3fe149efef98 # v3.1.0
5058
with:
5159
github-token: ${{ secrets.GITHUB_TOKEN }}
5260

53-
- name: GitHub actions bot approve
61+
- name: Check for ignored dependencies in the PR
62+
id: validate
5463
if: startsWith(steps.branchname.outputs.branch, 'dependabot/')
64+
env:
65+
IGNORE_PATTERN: ${{ env.IGNORE_PATTERN }}
66+
DEPENDENCY_NAMES: ${{ steps.metadata.outputs.dependency-names }}
67+
run: |
68+
if [[ -z ${IGNORE_PATTERN} ]]; then
69+
echo "ignore=false" >> "$GITHUB_OUTPUT"
70+
elif [[ -z ${DEPENDENCY_NAMES} ]]; then
71+
echo "ignore=false" >> "$GITHUB_OUTPUT"
72+
elif [[ ${DEPENDENCY_NAMES} =~ ${IGNORE_PATTERN} ]]; then
73+
echo "ignore=true" >> "$GITHUB_OUTPUT"
74+
fi
75+
76+
- name: GitHub actions bot approve
77+
id: auto_approve
78+
if: ${{
79+
startsWith(steps.branchname.outputs.branch, 'dependabot/')
80+
&& steps.validate.outputs.ignore != 'true'
81+
}}
5582
run: gh pr review --approve "$PR_URL"
5683
env:
5784
PR_URL: ${{ github.event.pull_request.html_url }}
@@ -60,6 +87,15 @@ jobs:
6087
# Enable GitHub auto merge
6188
- name: Auto merge
6289
uses: alexwilson/enable-github-automerge-action@2c32e18a76e0726ffe7a573bfff2d42a20885126 # 3.0.0
63-
if: startsWith(steps.branchname.outputs.branch, 'dependabot/') && (github.event.action == 'opened' || github.event.action == 'reopened') && (steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor')
90+
if: ${{
91+
startsWith(steps.branchname.outputs.branch, 'dependabot/')
92+
&& steps.auto_approve.conclusion == 'success'
93+
&& (github.event.action == 'opened' || github.event.action == 'reopened')
94+
&& (
95+
steps.metadata.outputs.update-type == 'version-update:semver-patch'
96+
|| (fromJSON(env.ALLOW_MINOR) && steps.metadata.outputs.update-type == 'version-update:semver-minor')
97+
|| (fromJSON(env.ALLOW_MAJOR) && steps.metadata.outputs.update-type == 'version-update:semver-major')
98+
)
99+
}}
64100
with:
65101
github-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/phpunit-mariadb.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,15 @@ jobs:
107107
path: apps/${{ env.APP_NAME }}
108108

109109
- name: Checkout app (richdocuments)
110-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
110+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
111111
with:
112112
persist-credentials: false
113113
path: apps/richdocuments
114114
repository: nextcloud/richdocuments
115115
ref: ${{ matrix.richdocuments-versions }}
116116

117117
- name: Checkout app (groupfolders)
118-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
118+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
119119
with:
120120
persist-credentials: false
121121
path: apps/groupfolders

‎.github/workflows/phpunit-mysql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,15 @@ jobs:
103103
path: apps/${{ env.APP_NAME }}
104104

105105
- name: Checkout app (richdocuments)
106-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
106+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
107107
with:
108108
persist-credentials: false
109109
path: apps/richdocuments
110110
repository: nextcloud/richdocuments
111111
ref: ${{ matrix.richdocuments-versions }}
112112

113113
- name: Checkout app (groupfolders)
114-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
114+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
115115
with:
116116
persist-credentials: false
117117
path: apps/groupfolders

‎.github/workflows/phpunit-oci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,15 @@ jobs:
117117
path: apps/${{ env.APP_NAME }}
118118

119119
- name: Checkout app (richdocuments)
120-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
120+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
121121
with:
122122
persist-credentials: false
123123
path: apps/richdocuments
124124
repository: nextcloud/richdocuments
125125
ref: ${{ matrix.richdocuments-versions }}
126126

127127
- name: Checkout app (groupfolders)
128-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
128+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
129129
with:
130130
persist-credentials: false
131131
path: apps/groupfolders

‎.github/workflows/phpunit-pgsql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,15 @@ jobs:
108108
path: apps/${{ env.APP_NAME }}
109109

110110
- name: Checkout app (richdocuments)
111-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
111+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
112112
with:
113113
persist-credentials: false
114114
path: apps/richdocuments
115115
repository: nextcloud/richdocuments
116116
ref: ${{ matrix.richdocuments-versions }}
117117

118118
- name: Checkout app (groupfolders)
119-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
119+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
120120
with:
121121
persist-credentials: false
122122
path: apps/groupfolders

‎.github/workflows/phpunit-sqlite.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,15 @@ jobs:
9797
path: apps/${{ env.APP_NAME }}
9898

9999
- name: Checkout app (richdocuments)
100-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
100+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
101101
with:
102102
persist-credentials: false
103103
path: apps/richdocuments
104104
repository: nextcloud/richdocuments
105105
ref: ${{ matrix.richdocuments-versions }}
106106

107107
- name: Checkout app (groupfolders)
108-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
108+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
109109
with:
110110
persist-credentials: false
111111
path: apps/groupfolders

‎.github/workflows/update-nextcloud-ocp.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
matrix:
3030
branches:
3131
- ${{ github.event.repository.default_branch }}
32+
- 'stable34'
3233
- 'stable33'
3334
- 'stable32'
3435

0 commit comments

Comments
 (0)