Skip to content

Commit 64ddd00

Browse files
authored
Merge pull request #539 from nextcloud/update-stable22-target-versions
Update stable22 target versions
2 parents 6189b57 + 033d474 commit 64ddd00

File tree

3 files changed

+65
-77
lines changed

3 files changed

+65
-77
lines changed

.github/workflows/oci.yml

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

.github/workflows/phpunit.yml

Lines changed: 64 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
matrix:
1515
php-versions: ['7.4', '8.0']
1616
databases: ['sqlite']
17-
server-versions: ['master']
17+
server-versions: ['stable22']
1818

1919
name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
2020

@@ -69,7 +69,7 @@ jobs:
6969
matrix:
7070
php-versions: ['7.4']
7171
databases: ['mysql']
72-
server-versions: ['master']
72+
server-versions: ['stable22']
7373

7474
name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
7575

@@ -134,7 +134,7 @@ jobs:
134134
matrix:
135135
php-versions: ['7.4']
136136
databases: ['pgsql']
137-
server-versions: ['master']
137+
server-versions: ['stable22']
138138

139139
name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
140140

@@ -191,3 +191,64 @@ jobs:
191191
- name: PHPUnit
192192
working-directory: apps/${{ env.APP_NAME }}
193193
run: ./vendor/phpunit/phpunit/phpunit -c tests/phpunit.xml
194+
195+
oci:
196+
runs-on: ubuntu-latest
197+
198+
strategy:
199+
# do not stop on another job's failure
200+
fail-fast: false
201+
matrix:
202+
php-versions: ['7.4']
203+
databases: ['oci']
204+
server-versions: ['stable22']
205+
206+
name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
207+
208+
services:
209+
oracle:
210+
image: deepdiver/docker-oracle-xe-11g # "wnameless/oracle-xe-11g-r2"
211+
ports:
212+
- "1521:1521"
213+
214+
steps:
215+
- name: Checkout server
216+
uses: actions/checkout@v2
217+
with:
218+
repository: nextcloud/server
219+
ref: ${{ matrix.server-versions }}
220+
221+
- name: Checkout submodules
222+
shell: bash
223+
run: |
224+
auth_header="$(git config --local --get http.https://github.com/.extraheader)"
225+
git submodule sync --recursive
226+
git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
227+
228+
- name: Checkout app
229+
uses: actions/checkout@v2
230+
with:
231+
path: apps/${{ env.APP_NAME }}
232+
233+
- name: Set up PHPUnit
234+
working-directory: apps/${{ env.APP_NAME }}
235+
run: composer i
236+
237+
- name: Set up php ${{ matrix.php-versions }}
238+
uses: "shivammathur/setup-php@v2"
239+
with:
240+
php-version: "${{ matrix.php-versions }}"
241+
extensions: mbstring, iconv, fileinfo, intl, oci8
242+
tools: phpunit:8.5.2
243+
coverage: none
244+
245+
- name: Set up Nextcloud
246+
run: |
247+
mkdir data
248+
./occ maintenance:install --verbose --database=oci --database-name=XE --database-host=127.0.0.1 --database-port=1521 --database-user=autotest --database-pass=owncloud --admin-user admin --admin-pass admin
249+
php -f index.php
250+
./occ app:enable --force ${{ env.APP_NAME }}
251+
252+
- name: PHPUnit
253+
working-directory: apps/${{ env.APP_NAME }}/tests
254+
run: phpunit -c phpunit.xml

.github/workflows/static-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
runs-on: ubuntu-latest
77
strategy:
88
matrix:
9-
ocp-version: [ '20', 'dev-master' ]
9+
ocp-version: [ 'dev-stable22' ]
1010
name: Nextcloud ${{ matrix.ocp-version }}
1111
steps:
1212
- name: Checkout

0 commit comments

Comments
 (0)