Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 716f90e

Browse files
icewind1991icewind1991
authored
Merge branch 'master' into no-ocp
Signed-off-by: Robin Appelman <[email protected]>
2 parents edcd616 + 23451de commit 716f90e

42 files changed

Lines changed: 325 additions & 192 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

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

2828
steps:
2929
- name: Checkout
30-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
30+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
3131

3232
- uses: webiny/action-conventional-commits@8bc41ff4e7d423d56fa4905f6ff79209a78776c7 # v1.3.0
3333
with:

‎.github/workflows/dispatch-workflow.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ on:
1212
workflow_dispatch:
1313
inputs:
1414
name:
15-
description: "The workflow to update (with .yml)"
15+
description: 'The workflow to update (with .yml)'
1616
required: true
17-
default: "node.yml"
17+
default: 'node.yml'
1818
page:
19-
description: "Page of the repository list to check (currently 1-3)"
19+
description: 'Page of the repository list to check (currently 1-3)'
2020
required: true
21-
default: "1"
21+
default: '1'
2222

2323
jobs:
2424
repositories:
@@ -39,7 +39,7 @@ jobs:
3939
id: search-repos
4040
# This is a simple curl to fetch the list of repos containing a file and extracting the repo names
4141
run: |
42-
REPOS=$(curl -H "Accept: application/vnd.github.v3+json" "https://api.github.com/orgs/${{ github.repository_owner }}/repos?per_page=100&page=${{ github.event.inputs.page }}" | jq -c 'map(.name)')
42+
REPOS=$(curl -H 'Accept: application/vnd.github.v3+json' 'https://api.github.com/orgs/${{ github.repository_owner }}/repos?per_page=100&page=${{ github.event.inputs.page }}' | jq -c 'map(.name)')
4343
echo "matrix=$REPOS" >> $GITHUB_OUTPUT
4444
4545
dispatch:
@@ -55,7 +55,7 @@ jobs:
5555

5656
steps:
5757
- name: Checkout target repository
58-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
58+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
5959
with:
6060
path: target
6161
repository: ${{ github.repository_owner }}/${{ matrix.repositories }}
@@ -68,25 +68,25 @@ jobs:
6868

6969
- name: Checkout source repository
7070
if: steps.check_file_existence.outputs.files_exists == 'true'
71-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
71+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
7272
with:
7373
path: source
7474

7575
- name: Copy workflow
7676
if: steps.check_file_existence.outputs.files_exists == 'true'
77-
run: cp ./source/workflow-templates/${{ github.event.inputs.name }} ./target/.github/workflows
77+
run: cp './source/workflow-templates/${{ github.event.inputs.name }}' ./target/.github/workflows
7878

7979
- name: Create Pull Request
8080
if: steps.check_file_existence.outputs.files_exists == 'true'
81-
uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # v4
81+
uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 # v7.0.1
8282
with:
83-
body: Automated update of the ${{ github.event.inputs.name }} workflow from https://github.com/${{ github.repository }}
84-
branch: feat/workflow-auto-update-${{ github.event.inputs.name }}
85-
commit-message: Updating ${{ github.event.inputs.name }} workflow from template
83+
body: 'Automated update of the ${{ github.event.inputs.name }} workflow from https://github.com/${{ github.repository }}'
84+
branch: 'feat/workflow-auto-update-${{ github.event.inputs.name }}'
85+
commit-message: 'chore(CI): Updating ${{ github.event.inputs.name }} workflow from template'
8686
committer: Nextcloud bot <[email protected]>
8787
author: Nextcloud bot <[email protected]>
8888
path: target
8989
signoff: true
90-
title: Updating ${{ github.event.inputs.name }} workflow from template
90+
title: 'chore(CI): Updating ${{ github.event.inputs.name }} workflow from template'
9191
labels: dependencies
9292
token: ${{ secrets.TEMPLATE_WORKFLOW_DISPATCH_PAT }}

‎.github/workflows/fixup.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ jobs:
3131

3232
steps:
3333
- name: Run check
34-
uses: skjnldsv/block-fixup-merge-action@42d26e1b536ce61e5cf467d65fb76caf4aa85acf # v1
34+
uses: skjnldsv/block-fixup-merge-action@c138ea99e45e186567b64cf065ce90f7158c236a # v2
3535
with:
3636
repo-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/lint-yaml.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818

1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
21+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
2222

23-
- name: Github action templates lint
23+
- name: GitHub action templates lint
2424
uses: ibiqlik/action-yamllint@2576378a8e339169678f9939646ee3ee325e845c # v3.1.1
2525
with:
2626
file_or_dir: workflow-templates

‎.github/workflows/reuse.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@ name: REUSE Compliance Check
1212
on: [pull_request]
1313

1414
jobs:
15-
test:
15+
reuse-compliance-check:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
19-
- name: REUSE Compliance Check
20-
uses: fsfe/reuse-action@a46482ca367aef4454a87620aa37c2be4b2f8106 # v3.0.0
18+
- name: Checkout
19+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
20+
21+
- name: REUSE Compliance Check
22+
uses: fsfe/reuse-action@3ae3c6bdf1257ab19397fab11fd3312144692083 # v4.0.0

‎.reuse/dep5‎

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

‎REUSE.toml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
2+
# SPDX-License-Identifier: MIT
3+
version = 1
4+
SPDX-PackageName = "Nextcloud's workflow templates"
5+
SPDX-PackageSupplier = "Nextcloud GmbH <https://nextcloud.com/impressum/>"
6+
SPDX-PackageDownloadLocation = "https://github.com/nextcloud/.github"
7+
8+
[[annotations]]
9+
path = "workflow-templates/**.properties.json"
10+
precedence = "aggregate"
11+
SPDX-FileCopyrightText = "2021-2024 Nextcloud GmbH and Nextcloud contributors"
12+
SPDX-License-Identifier = "MIT"
13+
14+
[[annotations]]
15+
path = "screenshots/**"
16+
precedence = "aggregate"
17+
SPDX-FileCopyrightText = "2022-2024 Nextcloud GmbH and Nextcloud contributors"
18+
SPDX-License-Identifier = "MIT"

‎non-community-usernames.txt‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
andrey18106
2+
dartcafe
3+
datenangebot
4+
elzody
5+
enjeck
6+
Fenn-CS
7+
grnd-alt
8+
hweihwang
9+
Ivansss
10+
joshtrichards
11+
JuliaKirschenheuter
12+
MB-Finski
13+
mejo-
14+
mgallien
15+
nc-fkl
16+
nextcloud-android-bot
17+
nextcloud-command
18+
raimund-schluessler
19+
rapterjet2004
20+
SebastianKrupinski
21+
skalidindi53
22+
skjnldsv
23+
susnux
24+
solracsf
25+
viktorix

‎non-community-usernames.txt.license‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
SPDX-FileCopyrightText: Nextcloud
2+
SPDX-License-Identifier: CC0-1.0

‎workflow-templates/appstore-build-publish.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
echo "APP_VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
3333
3434
- name: Checkout
35-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
35+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
3636
with:
3737
path: ${{ env.APP_NAME }}
3838

@@ -56,14 +56,14 @@ jobs:
5656
- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
5757
# Skip if no package.json
5858
if: ${{ steps.versions.outputs.nodeVersion }}
59-
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v3
59+
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
6060
with:
6161
node-version: ${{ steps.versions.outputs.nodeVersion }}
6262

6363
- name: Set up npm ${{ steps.versions.outputs.npmVersion }}
6464
# Skip if no package.json
6565
if: ${{ steps.versions.outputs.npmVersion }}
66-
run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
66+
run: npm i -g 'npm@${{ steps.versions.outputs.npmVersion }}'
6767

6868
- name: Get php version
6969
id: php-versions
@@ -72,7 +72,7 @@ jobs:
7272
filename: ${{ env.APP_NAME }}/appinfo/info.xml
7373

7474
- name: Set up php ${{ steps.php-versions.outputs.php-min }}
75-
uses: shivammathur/setup-php@c665c7a15b5295c2488ac8a87af9cb806cd72198 # v2
75+
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
7676
with:
7777
php-version: ${{ steps.php-versions.outputs.php-min }}
7878
coverage: none
@@ -95,7 +95,7 @@ jobs:
9595
# Skip if no package.json
9696
if: ${{ steps.versions.outputs.nodeVersion }}
9797
env:
98-
NODE_ENV: production
98+
CYPRESS_INSTALL_BINARY: 0
9999
run: |
100100
cd ${{ env.APP_NAME }}
101101
npm ci
@@ -129,12 +129,12 @@ jobs:
129129
continue-on-error: true
130130
id: server-checkout
131131
run: |
132-
NCVERSION=${{ fromJSON(steps.appinfo.outputs.result).nextcloud.min-version }}
132+
NCVERSION='${{ fromJSON(steps.appinfo.outputs.result).nextcloud.min-version }}'
133133
wget --quiet https://download.nextcloud.com/server/releases/latest-$NCVERSION.zip
134134
unzip latest-$NCVERSION.zip
135135
136136
- name: Checkout server master fallback
137-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
137+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
138138
if: ${{ steps.server-checkout.outcome != 'success' }}
139139
with:
140140
submodules: true
@@ -148,7 +148,7 @@ jobs:
148148
tar -xvf ${{ env.APP_NAME }}.tar.gz
149149
cd ../../../
150150
# Setting up keys
151-
echo "${{ secrets.APP_PRIVATE_KEY }}" > ${{ env.APP_NAME }}.key
151+
echo '${{ secrets.APP_PRIVATE_KEY }}' > ${{ env.APP_NAME }}.key
152152
wget --quiet "https://github.com/nextcloud/app-certificate-requests/raw/master/${{ env.APP_NAME }}/${{ env.APP_NAME }}.crt"
153153
# Signing
154154
php nextcloud/occ integrity:sign-app --privateKey=../${{ env.APP_NAME }}.key --certificate=../${{ env.APP_NAME }}.crt --path=../${{ env.APP_NAME }}/build/artifacts/${{ env.APP_NAME }}

0 commit comments

Comments
 (0)