Skip to content

Commit a6d8779

Browse files
blizzzblizzz
authored
Merge pull request #145 from nextcloud/release/1.11.0
Clean up, GH flows updates/additions, prepare for 1.11.0
2 parents 2ebaeaa + 850b8de commit a6d8779

22 files changed

+1631
-410
lines changed

Diff for: ‎.github/workflows/appstore-build-publish.yml

+1
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ jobs:
129129
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
130130
if: ${{ steps.server-checkout.outcome != 'success' }}
131131
with:
132+
submodules: true
132133
repository: nextcloud/server
133134
path: nextcloud
134135

Diff for: ‎.github/workflows/command-rebase.yml

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# This workflow is provided via the organization template repository
2+
#
3+
# https://github.com/nextcloud/.github
4+
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
5+
6+
name: Rebase command
7+
8+
on:
9+
issue_comment:
10+
types: created
11+
12+
permissions:
13+
contents: read
14+
15+
jobs:
16+
rebase:
17+
runs-on: ubuntu-latest
18+
permissions:
19+
contents: none
20+
21+
# On pull requests and if the comment starts with `/rebase`
22+
if: github.event.issue.pull_request != '' && startsWith(github.event.comment.body, '/rebase')
23+
24+
steps:
25+
- name: Add reaction on start
26+
uses: peter-evans/create-or-update-comment@5adcb0bb0f9fb3f95ef05400558bdb3f329ee808 # v2.1.0
27+
with:
28+
token: ${{ secrets.COMMAND_BOT_PAT }}
29+
repository: ${{ github.event.repository.full_name }}
30+
comment-id: ${{ github.event.comment.id }}
31+
reaction-type: "+1"
32+
33+
- name: Checkout the latest code
34+
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
35+
with:
36+
fetch-depth: 0
37+
token: ${{ secrets.COMMAND_BOT_PAT }}
38+
39+
- name: Automatic Rebase
40+
uses: cirrus-actions/rebase@6e572f08c244e2f04f9beb85a943eb618218714d # 1.7
41+
env:
42+
GITHUB_TOKEN: ${{ secrets.COMMAND_BOT_PAT }}
43+
44+
- name: Add reaction on failure
45+
uses: peter-evans/create-or-update-comment@5adcb0bb0f9fb3f95ef05400558bdb3f329ee808 # v2.1.0
46+
if: failure()
47+
with:
48+
token: ${{ secrets.COMMAND_BOT_PAT }}
49+
repository: ${{ github.event.repository.full_name }}
50+
comment-id: ${{ github.event.comment.id }}
51+
reaction-type: "-1"

Diff for: ‎.github/workflows/fixup.yml

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# This workflow is provided via the organization template repository
2+
#
3+
# https://github.com/nextcloud/.github
4+
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
5+
6+
name: Pull request checks
7+
8+
on:
9+
pull_request:
10+
types: [opened, ready_for_review, reopened, synchronize]
11+
12+
permissions:
13+
contents: read
14+
15+
concurrency:
16+
group: fixup-${{ github.head_ref || github.run_id }}
17+
cancel-in-progress: true
18+
19+
jobs:
20+
commit-message-check:
21+
if: github.event.pull_request.draft == false
22+
23+
permissions:
24+
pull-requests: write
25+
name: Block fixup and squash commits
26+
27+
runs-on: ubuntu-latest
28+
29+
steps:
30+
- name: Run check
31+
uses: xt0rted/block-autosquash-commits-action@79880c36b4811fe549cfffe20233df88876024e7 # v2
32+
with:
33+
repo-token: ${{ secrets.GITHUB_TOKEN }}

Diff for: ‎.github/workflows/lint-eslint-when-unrelated.yml

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# This workflow is provided via the organization template repository
2+
#
3+
# https://github.com/nextcloud/.github
4+
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
5+
#
6+
# Use lint-eslint together with lint-eslint-when-unrelated to make eslint a required check for GitHub actions
7+
# https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks#handling-skipped-but-required-checks
8+
9+
name: Lint
10+
11+
on:
12+
pull_request:
13+
paths-ignore:
14+
- '.github/workflows/**'
15+
- 'src/**'
16+
- 'appinfo/info.xml'
17+
- 'package.json'
18+
- 'package-lock.json'
19+
- 'tsconfig.json'
20+
- '.eslintrc.*'
21+
- '.eslintignore'
22+
- '**.js'
23+
- '**.ts'
24+
- '**.vue'
25+
26+
permissions:
27+
contents: read
28+
29+
jobs:
30+
lint:
31+
permissions:
32+
contents: none
33+
34+
runs-on: ubuntu-latest
35+
36+
name: eslint
37+
38+
steps:
39+
- run: 'echo "No eslint required"'

Diff for: ‎.github/workflows/lint-info-xml.yml

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# This workflow is provided via the organization template repository
2+
#
3+
# https://github.com/nextcloud/.github
4+
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
5+
6+
name: Lint
7+
8+
on:
9+
pull_request:
10+
push:
11+
branches:
12+
- main
13+
- master
14+
- stable*
15+
16+
permissions:
17+
contents: read
18+
19+
concurrency:
20+
group: lint-info-xml-${{ github.head_ref || github.run_id }}
21+
cancel-in-progress: true
22+
23+
jobs:
24+
xml-linters:
25+
runs-on: ubuntu-latest
26+
27+
name: info.xml lint
28+
steps:
29+
- name: Checkout
30+
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
31+
32+
- name: Download schema
33+
run: wget https://raw.githubusercontent.com/nextcloud/appstore/master/nextcloudappstore/api/v1/release/info.xsd
34+
35+
- name: Lint info.xml
36+
uses: ChristophWurst/xmllint-action@d18a551aab4728e4af449617638600634d7a48cb # v1
37+
with:
38+
xml-file: ./appinfo/info.xml
39+
xml-schema-file: ./info.xsd

Diff for: ‎.github/workflows/lint-php-cs.yml

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# This workflow is provided via the organization template repository
2+
#
3+
# https://github.com/nextcloud/.github
4+
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
5+
6+
name: Lint
7+
8+
on: pull_request
9+
10+
permissions:
11+
contents: read
12+
13+
concurrency:
14+
group: lint-php-cs-${{ github.head_ref || github.run_id }}
15+
cancel-in-progress: true
16+
17+
jobs:
18+
lint:
19+
runs-on: ubuntu-latest
20+
21+
name: php-cs
22+
23+
steps:
24+
- name: Checkout
25+
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
26+
27+
- name: Set up php
28+
uses: shivammathur/setup-php@1a18b2267f80291a81ca1d33e7c851fe09e7dfc4 # v2
29+
with:
30+
php-version: 8.1
31+
coverage: none
32+
env:
33+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
34+
35+
- name: Install dependencies
36+
run: composer i
37+
38+
- name: Lint
39+
run: composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 )

Diff for: ‎.github/workflows/lint-php.yml

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# This workflow is provided via the organization template repository
2+
#
3+
# https://github.com/nextcloud/.github
4+
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
5+
6+
name: Lint
7+
8+
on:
9+
pull_request:
10+
push:
11+
branches:
12+
- main
13+
- master
14+
- stable*
15+
16+
permissions:
17+
contents: read
18+
19+
concurrency:
20+
group: lint-php-${{ github.head_ref || github.run_id }}
21+
cancel-in-progress: true
22+
23+
jobs:
24+
php-lint:
25+
runs-on: ubuntu-latest
26+
strategy:
27+
matrix:
28+
php-versions: [ "8.0", "8.1", "8.2" ]
29+
30+
name: php-lint
31+
32+
steps:
33+
- name: Checkout
34+
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
35+
36+
- name: Set up php ${{ matrix.php-versions }}
37+
uses: shivammathur/setup-php@1a18b2267f80291a81ca1d33e7c851fe09e7dfc4 # v2
38+
with:
39+
php-version: ${{ matrix.php-versions }}
40+
coverage: none
41+
env:
42+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
43+
44+
- name: Lint
45+
run: composer run lint
46+
47+
summary:
48+
permissions:
49+
contents: none
50+
runs-on: ubuntu-latest
51+
needs: php-lint
52+
53+
if: always()
54+
55+
name: php-lint-summary
56+
57+
steps:
58+
- name: Summary status
59+
run: if ${{ needs.php-lint.result != 'success' && needs.php-lint.result != 'skipped' }}; then exit 1; fi

Diff for: ‎.github/workflows/lint.yml

-66
This file was deleted.

Diff for: ‎.github/workflows/psalm.yml

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# This workflow is provided via the organization template repository
2+
#
3+
# https://github.com/nextcloud/.github
4+
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
5+
6+
name: Static analysis
7+
8+
on:
9+
pull_request:
10+
push:
11+
branches:
12+
- master
13+
- main
14+
- stable*
15+
16+
concurrency:
17+
group: psalm-${{ github.head_ref || github.run_id }}
18+
cancel-in-progress: true
19+
20+
jobs:
21+
static-analysis:
22+
runs-on: ubuntu-latest
23+
24+
name: Nextcloud
25+
steps:
26+
- name: Checkout
27+
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
28+
29+
- name: Set up php
30+
uses: shivammathur/setup-php@1a18b2267f80291a81ca1d33e7c851fe09e7dfc4 # v2
31+
with:
32+
php-version: 8.1
33+
coverage: none
34+
env:
35+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
36+
37+
- name: Install dependencies
38+
run: composer i
39+
40+
- name: Run coding standards check
41+
run: composer run psalm

Diff for: ‎.github/workflows/update-nextcloud-ocp.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
branches: ["master", "stable25", "stable24"]
20+
branches: ["master"]
2121

2222
name: update-nextcloud-ocp-${{ matrix.branches }}
2323

0 commit comments

Comments
 (0)