Skip to content

Commit 78504d0

Browse files
come-nccome-nc
authored
Merge pull request #1081 from nextcloud/automated/noid/main-update-workflows
[main] ci(actions): Update workflow templates from organization template repository
2 parents 1bad914 + fccb388 commit 78504d0

File tree

9 files changed

+43
-52
lines changed

9 files changed

+43
-52
lines changed

‎.github/actions-lock.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
# SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
22
# SPDX-License-Identifier: MIT
3-
794da3d3e247bf6eb3601f542210906f appstore-build-publish.yml
4-
913847907fe33f406df6b9b3358b00fb command-compile.yml
5-
d1898b1290d50f874d8092ebda6ee5e1 dependabot-approve-merge.yml
3+
f776ffe8120cb9a8b2579bc30a7f7ca7 appstore-build-publish.yml
4+
0c3e9b2e56e1b2590a005a80b55c3218 command-compile.yml
5+
cbffe424c47647a2e375f96f25b67af9 dependabot-approve-merge.yml
66
2581a67c5bcdcd570427e6d51db767d7 fixup.yml
77
54f293d9abe11ac0035a7bbb96a4e453 lint-eslint.yml
88
80a58e5584612def0e751fcfb7669814 lint-info-xml.yml
99
ccd8a55c60e35b84becb0f7005ce1286 lint-php-cs.yml
1010
5dcc3187a9460cb62a455235cbdb3562 lint-php.yml
1111
cf229fbf443d2f7a303f22eb92745811 lint-stylelint.yml
1212
c965845a0def7b39d872e47e93dd1139 node.yml
13-
1c6d23a5f35e6bc1eea95c650e4f964b phpunit-mysql.yml
14-
2f8446b9ad19ee8debde6d712c81df95 phpunit-oci.yml
15-
169f77f131715906a40eb02877b650d3 phpunit-pgsql.yml
16-
fd94bce519297d48245483d469da9fcc phpunit-sqlite.yml
13+
5846b994639ccab0059bf23e141d389a phpunit-mysql.yml
14+
ec7d1084fbb3a6803dbabf3acdd17ac8 phpunit-oci.yml
15+
29b359a5b76e7ff8cd85af34b3bf36e3 phpunit-pgsql.yml
16+
182cc739d33a2441d3a9278a9bff55b4 phpunit-sqlite.yml
1717
3c4a096b3b7dbaef0f8e5190ffe13518 pr-feedback.yml
1818
2070d9569f327e758b9ce2b924c28fef psalm.yml
1919
7db5b820f3750eebe988005a0bb2febd reuse.yml
2020
9748607544294975609be21633372bdd sync-workflow-templates.yml
2121
800d5b188aa885626cf4169fa2dfea9e update-nextcloud-ocp-approve-merge.yml
22-
8e930a499e9e608b95ef45193e90259e update-nextcloud-ocp.yml
22+
1a3e76e59e411598dbf3042cd687ec33 update-nextcloud-ocp.yml

‎.github/workflows/appstore-build-publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696

9797
- name: Check composer.json
9898
id: check_composer
99-
uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3.0.0
99+
uses: andstor/file-existence-action@558493d6c74bf472d87c84eab196434afc2fa029 # v3.1.0
100100
with:
101101
files: "${{ env.APP_NAME }}/composer.json"
102102

@@ -118,7 +118,7 @@ jobs:
118118
119119
- name: Check Krankerl config
120120
id: krankerl
121-
uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3.0.0
121+
uses: andstor/file-existence-action@558493d6c74bf472d87c84eab196434afc2fa029 # v3.1.0
122122
with:
123123
files: ${{ env.APP_NAME }}/krankerl.toml
124124

‎.github/workflows/command-compile.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797

9898
steps:
9999
- name: Restore cached git repository
100-
uses: buildjet/cache@3e70d19e31d6a8030aeddf6ed8dbe601f94d09f4 # v4.0.2
100+
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
101101
with:
102102
path: .git
103103
key: git-repo

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ concurrency:
2424

2525
jobs:
2626
auto-approve-merge:
27-
if: github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'renovate[bot]'
27+
if: github.event.pull_request.user.login == 'dependabot[bot]'
2828
runs-on: ubuntu-latest-low
2929
permissions:
3030
# for hmarr/auto-approve-action to approve PRs

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
123123
- name: Check composer file existence
124124
id: check_composer
125-
uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3.0.0
125+
uses: andstor/file-existence-action@558493d6c74bf472d87c84eab196434afc2fa029 # v3.1.0
126126
with:
127127
files: apps/${{ env.APP_NAME }}/composer.json
128128

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129

130130
- name: Check composer file existence
131131
id: check_composer
132-
uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3.0.0
132+
uses: andstor/file-existence-action@558493d6c74bf472d87c84eab196434afc2fa029 # v3.1.0
133133
with:
134134
files: apps/${{ env.APP_NAME }}/composer.json
135135

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ jobs:
120120

121121
- name: Check composer file existence
122122
id: check_composer
123-
uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3.0.0
123+
uses: andstor/file-existence-action@558493d6c74bf472d87c84eab196434afc2fa029 # v3.1.0
124124
with:
125125
files: apps/${{ env.APP_NAME }}/composer.json
126126

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109

110110
- name: Check composer file existence
111111
id: check_composer
112-
uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3.0.0
112+
uses: andstor/file-existence-action@558493d6c74bf472d87c84eab196434afc2fa029 # v3.1.0
113113
with:
114114
files: apps/${{ env.APP_NAME }}/composer.json
115115

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

Lines changed: 27 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -62,53 +62,39 @@ jobs:
6262
if: steps.checkout.outcome == 'success'
6363
run: composer install
6464

65-
- name: Composer update nextcloud/ocp # zizmor: ignore[template-injection]
66-
id: update_branch
67-
if: ${{ steps.checkout.outcome == 'success' && matrix.branches != 'main' }}
68-
run: composer require --dev 'nextcloud/ocp:dev-${{ matrix.branches }}'
69-
70-
- name: Raise on issue on failure
71-
uses: dacbd/create-issue-action@cdb57ab6ff8862aa09fee2be6ba77a59581921c2 # v2.0.0
72-
if: ${{ steps.checkout.outcome == 'success' && failure() && steps.update_branch.conclusion == 'failure' }}
65+
- name: Check composer bin for nextcloud/ocp exists
66+
id: check_composer_bin
67+
uses: andstor/file-existence-action@558493d6c74bf472d87c84eab196434afc2fa029 # v3.1.0
7368
with:
74-
token: ${{ secrets.GITHUB_TOKEN }}
75-
title: 'Failed to update nextcloud/ocp package on branch ${{ matrix.branches }}'
76-
body: 'Please check the output of the GitHub action and manually resolve the issues<br>${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}<br>${{ steps.codeowners.outputs.codeowners }}'
69+
files: vendor-bin/nextcloud-ocp/composer.json
7770

7871
- name: Composer update nextcloud/ocp
79-
id: update_main
80-
if: ${{ steps.checkout.outcome == 'success' && matrix.branches == 'main' }}
81-
run: composer require --dev nextcloud/ocp:dev-master
72+
id: update_branch
73+
env:
74+
USE_COMPOSER_BIN: ${{ steps.check_composer_bin.outputs.files_exists }}
75+
BRANCH_NAME: ${{ matrix.branches }}
76+
run: |
77+
COMPOSER_CMD='composer'
78+
if [[ "$USE_COMPOSER_BIN" == 'true' ]]; then
79+
COMPOSER_CMD='composer bin nextcloud-ocp'
80+
fi
81+
82+
PACKAGE_VERSION="nextcloud/ocp:dev-$BRANCH_NAME"
83+
if [[ "$BRANCH_NAME" == 'main' ]]; then
84+
PACKAGE_VERSION='nextcloud/ocp:dev-master'
85+
fi
86+
87+
echo $COMPOSER_CMD require --dev $PACKAGE_VERSION
88+
$COMPOSER_CMD require --dev $PACKAGE_VERSION
8289
8390
- name: Raise on issue on failure
8491
uses: dacbd/create-issue-action@cdb57ab6ff8862aa09fee2be6ba77a59581921c2 # v2.0.0
85-
if: ${{ steps.checkout.outcome == 'success' && failure() && steps.update_main.conclusion == 'failure' }}
92+
if: ${{ steps.checkout.outcome == 'success' && failure() && steps.update_branch.conclusion == 'failure' }}
8693
with:
8794
token: ${{ secrets.GITHUB_TOKEN }}
8895
title: 'Failed to update nextcloud/ocp package on branch ${{ matrix.branches }}'
8996
body: 'Please check the output of the GitHub action and manually resolve the issues<br>${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}<br>${{ steps.codeowners.outputs.codeowners }}'
9097

91-
- name: Reset checkout 3rdparty
92-
if: steps.checkout.outcome == 'success'
93-
run: |
94-
git clean -f 3rdparty
95-
git checkout 3rdparty
96-
continue-on-error: true
97-
98-
- name: Reset checkout vendor
99-
if: steps.checkout.outcome == 'success'
100-
run: |
101-
git clean -f vendor
102-
git checkout vendor
103-
continue-on-error: true
104-
105-
- name: Reset checkout vendor-bin
106-
if: steps.checkout.outcome == 'success'
107-
run: |
108-
git clean -f vendor-bin
109-
git checkout vendor-bin
110-
continue-on-error: true
111-
11298
- name: Create Pull Request
11399
if: steps.checkout.outcome == 'success'
114100
uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
@@ -120,6 +106,11 @@ jobs:
120106
signoff: true
121107
branch: 'automated/noid/${{ matrix.branches }}-update-nextcloud-ocp'
122108
title: '[${{ matrix.branches }}] Update nextcloud/ocp dependency'
109+
add-path: |
110+
composer.json
111+
composer.lock
112+
vendor-bin/nextcloud-ocp/composer.json
113+
vendor-bin/nextcloud-ocp/composer.lock
123114
body: |
124115
Auto-generated update of [nextcloud/ocp](https://github.com/nextcloud-deps/ocp/) dependency
125116
labels: |

0 commit comments

Comments
 (0)