Skip to content

Commit d643a59

Browse files
bigcat88bigcat88
authored
updated NC versions, pinned checkout action to number. (#128)
Little update, before new iteration --------- Signed-off-by: Alexander Piskun <[email protected]>
1 parent 98259b5 commit d643a59

File tree

4 files changed

+38
-39
lines changed

4 files changed

+38
-39
lines changed

‎.github/workflows/analysis-coverage.yml‎

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
name: Analysis
2828

2929
steps:
30-
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
30+
- uses: actions/checkout@v4
3131
- uses: actions/setup-python@v4
3232
with:
3333
python-version: "3.9"
@@ -45,11 +45,11 @@ jobs:
4545
strategy:
4646
fail-fast: false
4747
matrix:
48-
nextcloud: [ "26.0.5" ]
48+
nextcloud: [ "26.0.7" ]
4949
python: [ "3.9" ]
5050
php-version: [ "8.1" ]
5151
include:
52-
- nextcloud: "27.0.2"
52+
- nextcloud: "27.1.1"
5353
python: "3.10"
5454
php-version: "8.2"
5555

@@ -109,7 +109,7 @@ jobs:
109109
php -S localhost:8080 &
110110
111111
- name: Checkout NcPyApi
112-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
112+
uses: actions/checkout@v4
113113
with:
114114
path: nc_py_api
115115

@@ -118,14 +118,17 @@ jobs:
118118
run: python3 -m pip -v install ".[dev]"
119119

120120
- name: Checkout AppAPI
121-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
121+
uses: actions/checkout@v4
122122
with:
123123
path: apps/app_api
124124
repository: cloud-py-api/app_api
125125

126+
- name: Patch base.php
127+
if: ${{ startsWith(matrix.nextcloud, '26') }}
128+
run: patch -p 1 -i apps/app_api/base_php.patch
129+
126130
- name: Install AppAPI
127131
run: |
128-
patch -p 1 -i apps/app_api/base_php.patch
129132
php occ app:enable app_api
130133
cd nc_py_api
131134
coverage run --data-file=.coverage.ci_install tests/_install.py &
@@ -138,7 +141,7 @@ jobs:
138141
timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null
139142
140143
- name: Checkout Talk
141-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
144+
uses: actions/checkout@v4
142145
with:
143146
path: apps/spreed
144147
repository: nextcloud/spreed
@@ -151,7 +154,6 @@ jobs:
151154
make build-js
152155
153156
- name: Enable Talk
154-
if: ${{ !startsWith(matrix.nextcloud, '27.') }} # for some reason, currently Talk fails with 27.0.2
155157
run: php occ app:enable spreed
156158

157159
- name: Generate coverage report
@@ -197,11 +199,11 @@ jobs:
197199
strategy:
198200
fail-fast: false
199201
matrix:
200-
nextcloud: [ "26.0.5" ]
202+
nextcloud: [ "26.0.7" ]
201203
python: [ "3.11" ]
202204
php-version: [ "8.1" ]
203205
include:
204-
- nextcloud: "27.0.2"
206+
- nextcloud: "27.1.1"
205207
python: "3.10"
206208
php-version: "8.2"
207209
env:
@@ -264,7 +266,7 @@ jobs:
264266
php -S localhost:8080 &
265267
266268
- name: Checkout NcPyApi
267-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
269+
uses: actions/checkout@v4
268270
with:
269271
path: nc_py_api
270272

@@ -273,7 +275,7 @@ jobs:
273275
run: python3 -m pip -v install ".[dev]"
274276

275277
- name: Checkout AppAPI
276-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
278+
uses: actions/checkout@v4
277279
if: ${{ !startsWith(matrix.nextcloud, '26.') }}
278280
with:
279281
path: apps/app_api
@@ -282,7 +284,6 @@ jobs:
282284
- name: Install AppAPI
283285
if: ${{ !startsWith(matrix.nextcloud, '26.') }}
284286
run: |
285-
patch -p 1 -i apps/app_api/base_php.patch
286287
php occ app:enable app_api
287288
cd nc_py_api
288289
coverage run --data-file=.coverage.ci_install tests/_install.py &
@@ -295,7 +296,7 @@ jobs:
295296
timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null
296297
297298
- name: Checkout Talk
298-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
299+
uses: actions/checkout@v4
299300
with:
300301
path: apps/spreed
301302
repository: nextcloud/spreed
@@ -308,7 +309,6 @@ jobs:
308309
make build-js
309310
310311
- name: Enable Talk
311-
if: ${{ !startsWith(matrix.nextcloud, '27.') }} # for some reason, currently Talk fails with 27.0.2
312312
run: php occ app:enable spreed
313313

314314
- name: Generate coverage report
@@ -354,7 +354,7 @@ jobs:
354354
strategy:
355355
fail-fast: false
356356
matrix:
357-
nextcloud: [ "27.0.2" ]
357+
nextcloud: [ "27.1.1" ]
358358
python: [ "3.11" ]
359359
php-version: [ "8.2" ]
360360

@@ -408,7 +408,7 @@ jobs:
408408
php -S localhost:8080 &
409409
410410
- name: Checkout NcPyApi
411-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
411+
uses: actions/checkout@v4
412412
with:
413413
path: nc_py_api
414414

@@ -417,14 +417,13 @@ jobs:
417417
run: python3 -m pip -v install ".[dev]"
418418

419419
- name: Checkout AppAPI
420-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
420+
uses: actions/checkout@v4
421421
with:
422422
path: apps/app_api
423423
repository: cloud-py-api/app_api
424424

425425
- name: Install AppAPI
426426
run: |
427-
patch -p 1 -i apps/app_api/base_php.patch
428427
php occ app:enable app_api
429428
cd nc_py_api
430429
coverage run --data-file=.coverage.ci_install tests/_install.py &
@@ -501,14 +500,14 @@ jobs:
501500
python-version: 3.11
502501

503502
- name: Checkout server
504-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
503+
uses: actions/checkout@v4
505504
with:
506505
submodules: true
507506
repository: nextcloud/server
508507
ref: "master"
509508

510509
- name: Checkout Notifications
511-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
510+
uses: actions/checkout@v4
512511
with:
513512
repository: nextcloud/notifications
514513
ref: "master"
@@ -528,7 +527,7 @@ jobs:
528527
php -S localhost:8080 &
529528
530529
- name: Checkout NcPyApi
531-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
530+
uses: actions/checkout@v4
532531
with:
533532
path: nc_py_api
534533

@@ -537,7 +536,7 @@ jobs:
537536
run: python3 -m pip -v install ".[dev]"
538537

539538
- name: Checkout AppAPI
540-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
539+
uses: actions/checkout@v4
541540
with:
542541
path: apps/app_api
543542
repository: cloud-py-api/app_api
@@ -556,7 +555,7 @@ jobs:
556555
timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null
557556
558557
- name: Checkout Talk
559-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
558+
uses: actions/checkout@v4
560559
with:
561560
path: apps/spreed
562561
repository: nextcloud/spreed
@@ -640,21 +639,21 @@ jobs:
640639
python-version: '3.12-dev'
641640

642641
- name: Checkout server
643-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
642+
uses: actions/checkout@v4
644643
with:
645644
submodules: true
646645
repository: nextcloud/server
647646
ref: "master"
648647

649648
- name: Checkout Notifications
650-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
649+
uses: actions/checkout@v4
651650
with:
652651
repository: nextcloud/notifications
653652
ref: "master"
654653
path: apps/notifications
655654

656655
- name: Checkout Activity
657-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
656+
uses: actions/checkout@v4
658657
with:
659658
repository: nextcloud/activity
660659
ref: "master"
@@ -675,7 +674,7 @@ jobs:
675674
php -S localhost:8080 &
676675
677676
- name: Checkout NcPyApi
678-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
677+
uses: actions/checkout@v4
679678
with:
680679
path: nc_py_api
681680

@@ -684,7 +683,7 @@ jobs:
684683
run: python3 -m pip -v install . pytest coverage pillow
685684

686685
- name: Checkout Talk
687-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
686+
uses: actions/checkout@v4
688687
with:
689688
path: apps/spreed
690689
repository: nextcloud/spreed
@@ -756,21 +755,21 @@ jobs:
756755
python-version: 3.11
757756

758757
- name: Checkout server
759-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
758+
uses: actions/checkout@v4
760759
with:
761760
submodules: true
762761
repository: nextcloud/server
763762
ref: ${{ matrix.nextcloud }}
764763

765764
- name: Checkout Notifications
766-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
765+
uses: actions/checkout@v4
767766
with:
768767
repository: nextcloud/notifications
769768
ref: ${{ matrix.nextcloud }}
770769
path: apps/notifications
771770

772771
- name: Checkout Activity
773-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
772+
uses: actions/checkout@v4
774773
with:
775774
repository: nextcloud/activity
776775
ref: ${{ matrix.nextcloud }}
@@ -791,7 +790,7 @@ jobs:
791790
php -S localhost:8080 &
792791
793792
- name: Checkout NcPyApi
794-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
793+
uses: actions/checkout@v4
795794
with:
796795
path: nc_py_api
797796

@@ -800,7 +799,7 @@ jobs:
800799
run: python3 -m pip -v install ".[dev]"
801800

802801
- name: Checkout AppAPI
803-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
802+
uses: actions/checkout@v4
804803
with:
805804
path: apps/app_api
806805
repository: cloud-py-api/app_api
@@ -823,7 +822,7 @@ jobs:
823822
timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null
824823
825824
- name: Checkout Talk
826-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
825+
uses: actions/checkout@v4
827826
with:
828827
path: apps/spreed
829828
repository: nextcloud/spreed

‎.github/workflows/docs-check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
13+
- uses: actions/checkout@v4
1414
- uses: actions/setup-python@v4
1515
with:
1616
python-version: '3.10'

‎.github/workflows/docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
14+
- uses: actions/checkout@v4
1515
- uses: actions/setup-python@v4
1616
with:
1717
python-version: '3.10'

‎.github/workflows/publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-22.04
1212

1313
steps:
14-
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
14+
- uses: actions/checkout@v4
1515
- name: Setup Python
1616
uses: actions/setup-python@v4
1717
with:
@@ -40,7 +40,7 @@ jobs:
4040
runs-on: ubuntu-22.04
4141

4242
steps:
43-
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
43+
- uses: actions/checkout@v4
4444
- name: Get tag
4545
run: |
4646
RELEASE_VERSION=$(sed -n "s/^__version__.*\"\(.*\)\"$/\\1/p" ./nc_py_api/_version.py)

0 commit comments

Comments
 (0)