Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated NC versions, pinned checkout action to number. #128

Merged
merged 6 commits into from
Sep 23, 2023
Merged

updated NC versions, pinned checkout action to number. #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ba68977
updated NC versions, pinned checkout action to number.
bigcat88 Sep 23, 2023
7bc5985
fixed CI, NC 27.1 already includes AppAPI patch
bigcat88 Sep 23, 2023
fcbfab2
fixed CI, NC 27.1 already includes AppAPI patch(2)
bigcat88 Sep 23, 2023
ad41ef4
testing if NC Talk is Ok now
bigcat88 Sep 23, 2023
8ea283f
testing if NC Talk is Ok now(2)
bigcat88 Sep 23, 2023
a02565c
Enabled testing Talk for 27.1 version
bigcat88 Sep 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 34 additions & 35 deletions .github/workflows/analysis-coverage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
name: Analysis

steps:
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: "3.9"
Expand All @@ -45,11 +45,11 @@ jobs:
strategy:
fail-fast: false
matrix:
nextcloud: [ "26.0.5" ]
nextcloud: [ "26.0.7" ]
python: [ "3.9" ]
php-version: [ "8.1" ]
include:
- nextcloud: "27.0.2"
- nextcloud: "27.1.1"
python: "3.10"
php-version: "8.2"

Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
php -S localhost:8080 &

- name: Checkout NcPyApi
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
uses: actions/checkout@v4
with:
path: nc_py_api

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

- name: Checkout AppAPI
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
uses: actions/checkout@v4
with:
path: apps/app_api
repository: cloud-py-api/app_api

- name: Patch base.php
if: ${{ startsWith(matrix.nextcloud, '26') }}
run: patch -p 1 -i apps/app_api/base_php.patch

- name: Install AppAPI
run: |
patch -p 1 -i apps/app_api/base_php.patch
php occ app:enable app_api
cd nc_py_api
coverage run --data-file=.coverage.ci_install tests/_install.py &
Expand All @@ -138,7 +141,7 @@ jobs:
timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null

- name: Checkout Talk
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
uses: actions/checkout@v4
with:
path: apps/spreed
repository: nextcloud/spreed
Expand All @@ -151,7 +154,6 @@ jobs:
make build-js

- name: Enable Talk
if: ${{ !startsWith(matrix.nextcloud, '27.') }} # for some reason, currently Talk fails with 27.0.2
run: php occ app:enable spreed

- name: Generate coverage report
Expand Down Expand Up @@ -197,11 +199,11 @@ jobs:
strategy:
fail-fast: false
matrix:
nextcloud: [ "26.0.5" ]
nextcloud: [ "26.0.7" ]
python: [ "3.11" ]
php-version: [ "8.1" ]
include:
- nextcloud: "27.0.2"
- nextcloud: "27.1.1"
python: "3.10"
php-version: "8.2"
env:
Expand Down Expand Up @@ -264,7 +266,7 @@ jobs:
php -S localhost:8080 &

- name: Checkout NcPyApi
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
uses: actions/checkout@v4
with:
path: nc_py_api

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

- name: Checkout AppAPI
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
uses: actions/checkout@v4
if: ${{ !startsWith(matrix.nextcloud, '26.') }}
with:
path: apps/app_api
Expand All @@ -282,7 +284,6 @@ jobs:
- name: Install AppAPI
if: ${{ !startsWith(matrix.nextcloud, '26.') }}
run: |
patch -p 1 -i apps/app_api/base_php.patch
php occ app:enable app_api
cd nc_py_api
coverage run --data-file=.coverage.ci_install tests/_install.py &
Expand All @@ -295,7 +296,7 @@ jobs:
timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null

- name: Checkout Talk
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
uses: actions/checkout@v4
with:
path: apps/spreed
repository: nextcloud/spreed
Expand All @@ -308,7 +309,6 @@ jobs:
make build-js

- name: Enable Talk
if: ${{ !startsWith(matrix.nextcloud, '27.') }} # for some reason, currently Talk fails with 27.0.2
run: php occ app:enable spreed

- name: Generate coverage report
Expand Down Expand Up @@ -354,7 +354,7 @@ jobs:
strategy:
fail-fast: false
matrix:
nextcloud: [ "27.0.2" ]
nextcloud: [ "27.1.1" ]
python: [ "3.11" ]
php-version: [ "8.2" ]

Expand Down Expand Up @@ -408,7 +408,7 @@ jobs:
php -S localhost:8080 &

- name: Checkout NcPyApi
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
uses: actions/checkout@v4
with:
path: nc_py_api

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

- name: Checkout AppAPI
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
uses: actions/checkout@v4
with:
path: apps/app_api
repository: cloud-py-api/app_api

- name: Install AppAPI
run: |
patch -p 1 -i apps/app_api/base_php.patch
php occ app:enable app_api
cd nc_py_api
coverage run --data-file=.coverage.ci_install tests/_install.py &
Expand Down Expand Up @@ -501,14 +500,14 @@ jobs:
python-version: 3.11

- name: Checkout server
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
uses: actions/checkout@v4
with:
submodules: true
repository: nextcloud/server
ref: "master"

- name: Checkout Notifications
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
uses: actions/checkout@v4
with:
repository: nextcloud/notifications
ref: "master"
Expand All @@ -528,7 +527,7 @@ jobs:
php -S localhost:8080 &

- name: Checkout NcPyApi
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
uses: actions/checkout@v4
with:
path: nc_py_api

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

- name: Checkout AppAPI
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
uses: actions/checkout@v4
with:
path: apps/app_api
repository: cloud-py-api/app_api
Expand All @@ -556,7 +555,7 @@ jobs:
timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null

- name: Checkout Talk
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
uses: actions/checkout@v4
with:
path: apps/spreed
repository: nextcloud/spreed
Expand Down Expand Up @@ -640,21 +639,21 @@ jobs:
python-version: '3.12-dev'

- name: Checkout server
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
uses: actions/checkout@v4
with:
submodules: true
repository: nextcloud/server
ref: "master"

- name: Checkout Notifications
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
uses: actions/checkout@v4
with:
repository: nextcloud/notifications
ref: "master"
path: apps/notifications

- name: Checkout Activity
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
uses: actions/checkout@v4
with:
repository: nextcloud/activity
ref: "master"
Expand All @@ -675,7 +674,7 @@ jobs:
php -S localhost:8080 &

- name: Checkout NcPyApi
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
uses: actions/checkout@v4
with:
path: nc_py_api

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

- name: Checkout Talk
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
uses: actions/checkout@v4
with:
path: apps/spreed
repository: nextcloud/spreed
Expand Down Expand Up @@ -756,21 +755,21 @@ jobs:
python-version: 3.11

- name: Checkout server
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
uses: actions/checkout@v4
with:
submodules: true
repository: nextcloud/server
ref: ${{ matrix.nextcloud }}

- name: Checkout Notifications
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
uses: actions/checkout@v4
with:
repository: nextcloud/notifications
ref: ${{ matrix.nextcloud }}
path: apps/notifications

- name: Checkout Activity
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
uses: actions/checkout@v4
with:
repository: nextcloud/activity
ref: ${{ matrix.nextcloud }}
Expand All @@ -791,7 +790,7 @@ jobs:
php -S localhost:8080 &

- name: Checkout NcPyApi
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
uses: actions/checkout@v4
with:
path: nc_py_api

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

- name: Checkout AppAPI
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
uses: actions/checkout@v4
with:
path: apps/app_api
repository: cloud-py-api/app_api
Expand All @@ -823,7 +822,7 @@ jobs:
timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null

- name: Checkout Talk
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
uses: actions/checkout@v4
with:
path: apps/spreed
repository: nextcloud/spreed
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: '3.10'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: '3.10'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
- uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v4
with:
Expand Down Expand Up @@ -40,7 +40,7 @@ jobs:
runs-on: ubuntu-22.04

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