Skip to content

Commit a4d859c

Browse files
authored
Merge branch 'master' into pulsejet/sidebar-tags
Signed-off-by: Varun Patil <varunpatil@ucla.edu>
2 parents 3980aa5 + 107bafd commit a4d859c

File tree

981 files changed

+10138
-5136
lines changed

Some content is hidden

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

981 files changed

+10138
-5136
lines changed

.drone.yml

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1621,66 +1621,6 @@ trigger:
16211621
- pull_request
16221622
- push
16231623

1624-
---
1625-
kind: pipeline
1626-
name: acceptance-login
1627-
1628-
steps:
1629-
- name: submodules
1630-
image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
1631-
commands:
1632-
- git submodule update --init
1633-
- name: acceptance-login
1634-
image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
1635-
commands:
1636-
- tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-login --selenium-server selenium:4444 allow-git-repository-modifications features/login.feature
1637-
1638-
services:
1639-
- name: selenium
1640-
image: ghcr.io/nextcloud/continuous-integration-selenium:3.141.59
1641-
environment:
1642-
# Reduce default log level for Selenium server (INFO) as it is too
1643-
# verbose.
1644-
JAVA_OPTS: -Dselenium.LOGGER.level=WARNING
1645-
1646-
trigger:
1647-
branch:
1648-
- master
1649-
- stable*
1650-
event:
1651-
- pull_request
1652-
- push
1653-
1654-
---
1655-
kind: pipeline
1656-
name: acceptance-users
1657-
1658-
steps:
1659-
- name: submodules
1660-
image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
1661-
commands:
1662-
- git submodule update --init
1663-
- name: acceptance-users
1664-
image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
1665-
commands:
1666-
- tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-users --selenium-server selenium:4444 allow-git-repository-modifications features/users.feature
1667-
1668-
services:
1669-
- name: selenium
1670-
image: ghcr.io/nextcloud/continuous-integration-selenium:3.141.59
1671-
environment:
1672-
# Reduce default log level for Selenium server (INFO) as it is too
1673-
# verbose.
1674-
JAVA_OPTS: -Dselenium.LOGGER.level=WARNING
1675-
1676-
trigger:
1677-
branch:
1678-
- master
1679-
- stable*
1680-
event:
1681-
- pull_request
1682-
- push
1683-
16841624
---
16851625
kind: pipeline
16861626
name: acceptance-apps

.github/workflows/command-compile.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
require: write
2424

2525
- name: Add reaction on start
26-
uses: peter-evans/create-or-update-comment@c6c9a1a66007646a28c153e2a8580a5bad27bcfa # v3.0.2
26+
uses: peter-evans/create-or-update-comment@23ff15729ef2fc348714a3bb66d2f655ca9066f2 # v3.1.0
2727
with:
2828
token: ${{ secrets.COMMAND_BOT_PAT }}
2929
repository: ${{ github.event.repository.full_name }}
@@ -60,7 +60,7 @@ jobs:
6060
key: git-repo
6161

6262
- name: Checkout ${{ needs.init.outputs.head_ref }}
63-
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v3.6.0
63+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3.6.0
6464
with:
6565
token: ${{ secrets.COMMAND_BOT_PAT }}
6666
fetch-depth: 0
@@ -116,7 +116,7 @@ jobs:
116116
git push --force origin ${{ needs.init.outputs.head_ref }}
117117
118118
- name: Add reaction on failure
119-
uses: peter-evans/create-or-update-comment@c6c9a1a66007646a28c153e2a8580a5bad27bcfa # v3.0.2
119+
uses: peter-evans/create-or-update-comment@23ff15729ef2fc348714a3bb66d2f655ca9066f2 # v3.1.0
120120
if: failure()
121121
with:
122122
token: ${{ secrets.COMMAND_BOT_PAT }}

.github/workflows/command-pull-3rdparty.yml

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

1919
steps:
2020
- name: Add reaction on start
21-
uses: peter-evans/create-or-update-comment@c6c9a1a66007646a28c153e2a8580a5bad27bcfa # v3.0.1
21+
uses: peter-evans/create-or-update-comment@23ff15729ef2fc348714a3bb66d2f655ca9066f2 # v3.0.1
2222
with:
2323
token: ${{ secrets.COMMAND_BOT_PAT }}
2424
repository: ${{ github.event.repository.full_name }}
@@ -30,7 +30,7 @@ jobs:
3030
id: comment-branch
3131

3232
- name: Checkout ${{ steps.comment-branch.outputs.head_ref }}
33-
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
33+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
3434
with:
3535
fetch-depth: 0
3636
token: ${{ secrets.COMMAND_BOT_PAT }}
@@ -51,7 +51,7 @@ jobs:
5151
git push
5252
5353
- name: Add reaction on failure
54-
uses: peter-evans/create-or-update-comment@c6c9a1a66007646a28c153e2a8580a5bad27bcfa # v3.0.1
54+
uses: peter-evans/create-or-update-comment@23ff15729ef2fc348714a3bb66d2f655ca9066f2 # v3.0.1
5555
if: failure()
5656
with:
5757
token: ${{ secrets.COMMAND_BOT_PAT }}

.github/workflows/command-rebase.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ jobs:
2323

2424
steps:
2525
- name: Add reaction on start
26-
uses: peter-evans/create-or-update-comment@c6c9a1a66007646a28c153e2a8580a5bad27bcfa # v3.0.1
26+
uses: peter-evans/create-or-update-comment@23ff15729ef2fc348714a3bb66d2f655ca9066f2 # v3.0.1
2727
with:
2828
token: ${{ secrets.COMMAND_BOT_PAT }}
2929
repository: ${{ github.event.repository.full_name }}
3030
comment-id: ${{ github.event.comment.id }}
3131
reaction-type: "+1"
3232

3333
- name: Checkout the latest code
34-
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v3.5.2
34+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3.5.2
3535
with:
3636
fetch-depth: 0
3737
token: ${{ secrets.COMMAND_BOT_PAT }}
@@ -42,7 +42,7 @@ jobs:
4242
GITHUB_TOKEN: ${{ secrets.COMMAND_BOT_PAT }}
4343

4444
- name: Add reaction on failure
45-
uses: peter-evans/create-or-update-comment@c6c9a1a66007646a28c153e2a8580a5bad27bcfa # v3.0.1
45+
uses: peter-evans/create-or-update-comment@23ff15729ef2fc348714a3bb66d2f655ca9066f2 # v3.0.1
4646
if: failure()
4747
with:
4848
token: ${{ secrets.COMMAND_BOT_PAT }}

.github/workflows/cypress.yml

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
steps:
2525
- name: Checkout app
26-
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v3.5.2
26+
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
2727

2828
- name: Check composer.json
2929
id: check_composer
@@ -39,8 +39,8 @@ jobs:
3939
uses: skjnldsv/read-package-engines-version-actions@8205673bab74a63eb9b8093402fd9e0e018663a1 # v2.2
4040
id: versions
4141
with:
42-
fallbackNode: "^14"
43-
fallbackNpm: "^7"
42+
fallbackNode: "^20"
43+
fallbackNpm: "^9"
4444

4545
- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
4646
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
@@ -72,15 +72,11 @@ jobs:
7272
fail-fast: false
7373
matrix:
7474
# Run multiple copies of the current job in parallel
75-
# Please increase the number or runners as your tests suite grows
76-
containers: ["component", 1, 2]
77-
# Only use cypress cloud for PRs
78-
use-cypress-cloud:
79-
- ${{ !!github.head_ref }}
80-
# Only use one container if we are not using the cypress cloud.
81-
exclude:
82-
- use-cypress-cloud: false
83-
containers: 2
75+
# Please increase the number or runners as your tests suite grows (0 based index for e2e tests)
76+
containers: ["component", 0, 1, 2]
77+
# Hack as strategy.job-total includes the component and GitHub does not allow math expressions
78+
# Always aling this number with the total of e2e runners (max. index + 1)
79+
total-containers: [3]
8480

8581
name: runner ${{ matrix.containers }}
8682

@@ -103,9 +99,6 @@ jobs:
10399
- name: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }} cypress tests
104100
uses: cypress-io/github-action@59810ebfa5a5ac6fcfdcfdf036d1cd4d083a88f2 # v6.5.0
105101
with:
106-
record: ${{ !!matrix.use-cypress-cloud }}
107-
parallel: ${{ !!matrix.use-cypress-cloud }}
108-
# cypress run type
109102
component: ${{ matrix.containers == 'component' }}
110103
group: ${{ matrix.use-cypress-cloud && matrix.containers == 'component' && 'Run component' || matrix.use-cypress-cloud && 'Run E2E' || '' }}
111104
# cypress env
@@ -120,6 +113,8 @@ jobs:
120113
TESTING: true
121114
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
122115
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
116+
SPLIT: ${{ matrix.total-containers }}
117+
SPLIT_INDEX: ${{ matrix.containers == 'component' && 0 || matrix.containers }}
123118

124119
- name: Upload snapshots
125120
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3

.github/workflows/ftp.yml

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

3333
steps:
3434
- name: Checkout server
35-
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
35+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
3636
with:
3737
submodules: true
3838

.github/workflows/lint-eslint.yml

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

3939
steps:
4040
- name: Checkout
41-
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v3.6.0
41+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3.6.0
4242

4343
- name: Read package.json node and npm engines version
4444
uses: skjnldsv/read-package-engines-version-actions@8205673bab74a63eb9b8093402fd9e0e018663a1 # v2.2

.github/workflows/lint-php-cs.yml

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

2323
steps:
2424
- name: Checkout
25-
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v3.5.2
25+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3.5.2
2626

2727
- name: Set up php
2828
uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2

.github/workflows/lint-php.yml

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

3232
steps:
3333
- name: Checkout
34-
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v3.5.2
34+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3.5.2
3535

3636
- name: Set up php ${{ matrix.php-versions }}
3737
uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2

.github/workflows/node-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
22+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
2323

2424
- name: Read package.json node and npm engines version
2525
uses: skjnldsv/read-package-engines-version-actions@8205673bab74a63eb9b8093402fd9e0e018663a1
@@ -37,7 +37,7 @@ jobs:
3737

3838
steps:
3939
- name: Checkout
40-
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
40+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
4141

4242
- name: Set up node ${{ needs.versions.outputs.nodeVersion }}
4343
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d
@@ -70,7 +70,7 @@ jobs:
7070

7171
steps:
7272
- name: Checkout
73-
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
73+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
7474

7575
- name: Set up node ${{ needs.versions.outputs.nodeVersion }}
7676
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d
@@ -98,7 +98,7 @@ jobs:
9898

9999
steps:
100100
- name: Checkout
101-
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
101+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
102102

103103
- name: Set up node ${{ needs.versions.outputs.nodeVersion }}
104104
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d

0 commit comments

Comments
 (0)