Skip to content

Commit 52340d0

Browse files
Chartman123Chartman123
committed
fix: re-apply changes and create patch files
Signed-off-by: Christian Hartmann <chris-hartmann@gmx.de>
1 parent 8c16e79 commit 52340d0

11 files changed

Lines changed: 296 additions & 9 deletions

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,14 @@ jobs:
105105
persist-credentials: false
106106
path: apps/${{ env.APP_NAME }}
107107

108+
- name: Checkout teams dependency
109+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
110+
with:
111+
persist-credentials: false
112+
repository: nextcloud/circles
113+
ref: ${{ matrix.server-versions }}
114+
path: apps/circles
115+
108116
- name: Set up php ${{ matrix.php-versions }}
109117
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
110118
with:
@@ -160,7 +168,7 @@ jobs:
160168
# Only run if phpunit config file exists
161169
if: steps.check_phpunit.outcome == 'success'
162170
working-directory: apps/${{ env.APP_NAME }}
163-
run: composer run test:unit
171+
run: composer run test:unit -- --no-coverage
164172

165173
- name: Check PHPUnit integration script is defined
166174
id: check_integration
@@ -178,7 +186,7 @@ jobs:
178186
# Only run if phpunit integration config file exists
179187
if: steps.check_integration.outcome == 'success'
180188
working-directory: apps/${{ env.APP_NAME }}
181-
run: composer run test:integration
189+
run: composer run test:integration -- --no-coverage
182190

183191
- name: Print logs
184192
if: always()

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
diff --git a/.github/workflows/phpunit-mariadb.yml b/.github/workflows/phpunit-mariadb.yml
2+
index 2e7b92b0..5d69d19c 100644
3+
--- a/.github/workflows/phpunit-mariadb.yml
4+
+++ b/.github/workflows/phpunit-mariadb.yml
5+
@@ -105,6 +105,14 @@ jobs:
6+
persist-credentials: false
7+
path: apps/${{ env.APP_NAME }}
8+
9+
+ - name: Checkout teams dependency
10+
+ uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
11+
+ with:
12+
+ persist-credentials: false
13+
+ repository: nextcloud/circles
14+
+ ref: ${{ matrix.server-versions }}
15+
+ path: apps/circles
16+
+
17+
- name: Set up php ${{ matrix.php-versions }}
18+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
19+
with:
20+
@@ -160,7 +168,7 @@ jobs:
21+
# Only run if phpunit config file exists
22+
if: steps.check_phpunit.outcome == 'success'
23+
working-directory: apps/${{ env.APP_NAME }}
24+
- run: composer run test:unit
25+
+ run: composer run test:unit -- --no-coverage
26+
27+
- name: Check PHPUnit integration script is defined
28+
id: check_integration
29+
@@ -178,7 +186,7 @@ jobs:
30+
# Only run if phpunit integration config file exists
31+
if: steps.check_integration.outcome == 'success'
32+
working-directory: apps/${{ env.APP_NAME }}
33+
- run: composer run test:integration
34+
+ run: composer run test:integration -- --no-coverage
35+
36+
- name: Print logs
37+
if: always()

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,14 @@ jobs:
103103
persist-credentials: false
104104
path: apps/${{ env.APP_NAME }}
105105

106+
- name: Checkout teams dependency
107+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
108+
with:
109+
persist-credentials: false
110+
repository: nextcloud/circles
111+
ref: ${{ matrix.server-versions }}
112+
path: apps/circles
113+
106114
- name: Set up php ${{ matrix.php-versions }}
107115
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
108116
with:
@@ -158,7 +166,7 @@ jobs:
158166
# Only run if phpunit config file exists
159167
if: steps.check_phpunit.outcome == 'success'
160168
working-directory: apps/${{ env.APP_NAME }}
161-
run: composer run test:unit
169+
run: composer run test:unit -- --no-coverage
162170

163171
- name: Check PHPUnit integration script is defined
164172
id: check_integration
@@ -176,7 +184,7 @@ jobs:
176184
# Only run if phpunit integration config file exists
177185
if: steps.check_integration.outcome == 'success'
178186
working-directory: apps/${{ env.APP_NAME }}
179-
run: composer run test:integration
187+
run: composer run test:integration -- --no-coverage
180188

181189
- name: Print logs
182190
if: always()

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
2+
index 596d91ea..d6e8bc33 100644
3+
--- a/.github/workflows/phpunit-mysql.yml
4+
+++ b/.github/workflows/phpunit-mysql.yml
5+
@@ -103,6 +103,14 @@ jobs:
6+
persist-credentials: false
7+
path: apps/${{ env.APP_NAME }}
8+
9+
+ - name: Checkout teams dependency
10+
+ uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
11+
+ with:
12+
+ persist-credentials: false
13+
+ repository: nextcloud/circles
14+
+ ref: ${{ matrix.server-versions }}
15+
+ path: apps/circles
16+
+
17+
- name: Set up php ${{ matrix.php-versions }}
18+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
19+
with:
20+
@@ -158,7 +166,7 @@ jobs:
21+
# Only run if phpunit config file exists
22+
if: steps.check_phpunit.outcome == 'success'
23+
working-directory: apps/${{ env.APP_NAME }}
24+
- run: composer run test:unit
25+
+ run: composer run test:unit -- --no-coverage
26+
27+
- name: Check PHPUnit integration script is defined
28+
id: check_integration
29+
@@ -176,7 +184,7 @@ jobs:
30+
# Only run if phpunit integration config file exists
31+
if: steps.check_integration.outcome == 'success'
32+
working-directory: apps/${{ env.APP_NAME }}
33+
- run: composer run test:integration
34+
+ run: composer run test:integration -- --no-coverage
35+
36+
- name: Print logs
37+
if: always()

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,14 @@ jobs:
115115
persist-credentials: false
116116
path: apps/${{ env.APP_NAME }}
117117

118+
- name: Checkout teams dependency
119+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
120+
with:
121+
persist-credentials: false
122+
repository: nextcloud/circles
123+
ref: ${{ matrix.server-versions }}
124+
path: apps/circles
125+
118126
- name: Set up php ${{ matrix.php-versions }}
119127
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
120128
with:
@@ -165,7 +173,7 @@ jobs:
165173
# Only run if phpunit config file exists
166174
if: steps.check_phpunit.outcome == 'success'
167175
working-directory: apps/${{ env.APP_NAME }}
168-
run: composer run test:unit
176+
run: composer run test:unit -- --no-coverage
169177

170178
- name: Check PHPUnit integration script is defined
171179
id: check_integration
@@ -183,7 +191,7 @@ jobs:
183191
# Only run if phpunit integration config file exists
184192
if: steps.check_integration.outcome == 'success'
185193
working-directory: apps/${{ env.APP_NAME }}
186-
run: composer run test:integration
194+
run: composer run test:integration -- --no-coverage
187195

188196
- name: Print logs
189197
if: always()

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml
2+
index 4314399b..52616262 100644
3+
--- a/.github/workflows/phpunit-oci.yml
4+
+++ b/.github/workflows/phpunit-oci.yml
5+
@@ -115,6 +115,14 @@ jobs:
6+
persist-credentials: false
7+
path: apps/${{ env.APP_NAME }}
8+
9+
+ - name: Checkout teams dependency
10+
+ uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
11+
+ with:
12+
+ persist-credentials: false
13+
+ repository: nextcloud/circles
14+
+ ref: ${{ matrix.server-versions }}
15+
+ path: apps/circles
16+
+
17+
- name: Set up php ${{ matrix.php-versions }}
18+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
19+
with:
20+
@@ -165,7 +173,7 @@ jobs:
21+
# Only run if phpunit config file exists
22+
if: steps.check_phpunit.outcome == 'success'
23+
working-directory: apps/${{ env.APP_NAME }}
24+
- run: composer run test:unit
25+
+ run: composer run test:unit -- --no-coverage
26+
27+
- name: Check PHPUnit integration script is defined
28+
id: check_integration
29+
@@ -183,7 +191,7 @@ jobs:
30+
# Only run if phpunit integration config file exists
31+
if: steps.check_integration.outcome == 'success'
32+
working-directory: apps/${{ env.APP_NAME }}
33+
- run: composer run test:integration
34+
+ run: composer run test:integration -- --no-coverage
35+
36+
- name: Print logs
37+
if: always()

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,14 @@ jobs:
106106
persist-credentials: false
107107
path: apps/${{ env.APP_NAME }}
108108

109+
- name: Checkout teams dependency
110+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
111+
with:
112+
persist-credentials: false
113+
repository: nextcloud/circles
114+
ref: ${{ matrix.server-versions }}
115+
path: apps/circles
116+
109117
- name: Set up php ${{ matrix.php-versions }}
110118
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
111119
with:
@@ -156,7 +164,7 @@ jobs:
156164
# Only run if phpunit config file exists
157165
if: steps.check_phpunit.outcome == 'success'
158166
working-directory: apps/${{ env.APP_NAME }}
159-
run: composer run test:unit
167+
run: composer run test:unit -- --no-coverage
160168

161169
- name: Check PHPUnit integration script is defined
162170
id: check_integration
@@ -174,7 +182,7 @@ jobs:
174182
# Only run if phpunit integration config file exists
175183
if: steps.check_integration.outcome == 'success'
176184
working-directory: apps/${{ env.APP_NAME }}
177-
run: composer run test:integration
185+
run: composer run test:integration -- --no-coverage
178186

179187
- name: Print logs
180188
if: always()

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml
2+
index dab23f2e..01da9d6b 100644
3+
--- a/.github/workflows/phpunit-pgsql.yml
4+
+++ b/.github/workflows/phpunit-pgsql.yml
5+
@@ -106,6 +106,14 @@ jobs:
6+
persist-credentials: false
7+
path: apps/${{ env.APP_NAME }}
8+
9+
+ - name: Checkout teams dependency
10+
+ uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
11+
+ with:
12+
+ persist-credentials: false
13+
+ repository: nextcloud/circles
14+
+ ref: ${{ matrix.server-versions }}
15+
+ path: apps/circles
16+
+
17+
- name: Set up php ${{ matrix.php-versions }}
18+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
19+
with:
20+
@@ -156,7 +164,7 @@ jobs:
21+
# Only run if phpunit config file exists
22+
if: steps.check_phpunit.outcome == 'success'
23+
working-directory: apps/${{ env.APP_NAME }}
24+
- run: composer run test:unit
25+
+ run: composer run test:unit -- --no-coverage
26+
27+
- name: Check PHPUnit integration script is defined
28+
id: check_integration
29+
@@ -174,7 +182,7 @@ jobs:
30+
# Only run if phpunit integration config file exists
31+
if: steps.check_integration.outcome == 'success'
32+
working-directory: apps/${{ env.APP_NAME }}
33+
- run: composer run test:integration
34+
+ run: composer run test:integration -- --no-coverage
35+
36+
- name: Print logs
37+
if: always()

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

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,29 @@ jobs:
9595
persist-credentials: false
9696
path: apps/${{ env.APP_NAME }}
9797

98+
- name: Checkout teams app
99+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
100+
with:
101+
persist-credentials: false
102+
repository: nextcloud/circles
103+
ref: ${{ matrix.server-versions }}
104+
path: apps/circles
105+
106+
- name: Checkout analytics app
107+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
108+
with:
109+
persist-credentials: false
110+
repository: rello/analytics
111+
ref: master
112+
path: apps/analytics
113+
98114
- name: Set up php ${{ matrix.php-versions }}
99115
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
100116
with:
101117
php-version: ${{ matrix.php-versions }}
102118
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
103119
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
104-
coverage: none
120+
coverage: xdebug
105121
ini-file: development
106122
# Temporary workaround for missing pcntl_* in PHP 8.3
107123
ini-values: disable_functions=
@@ -147,6 +163,15 @@ jobs:
147163
working-directory: apps/${{ env.APP_NAME }}
148164
run: composer run test:unit
149165

166+
- name: Upload Unit coverage
167+
uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
168+
with:
169+
working-directory: apps/${{ env.APP_NAME }}
170+
disable_search: true
171+
files: tests/clover.unit.xml
172+
fail_ci_if_error: true
173+
flags: unit
174+
150175
- name: Check PHPUnit integration script is defined
151176
id: check_integration
152177
continue-on-error: true
@@ -165,6 +190,15 @@ jobs:
165190
working-directory: apps/${{ env.APP_NAME }}
166191
run: composer run test:integration
167192

193+
- name: Upload Integration coverage
194+
uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
195+
with:
196+
working-directory: apps/${{ env.APP_NAME }}
197+
disable_search: true
198+
files: tests/clover.integration.xml
199+
fail_ci_if_error: true
200+
flags: integration
201+
168202
- name: Print logs
169203
if: always()
170204
run: |

0 commit comments

Comments
 (0)