From ba68977ac29db6ac7813e4c3df9da66fa5d8f166 Mon Sep 17 00:00:00 2001 From: Alexander Piskun Date: Sat, 23 Sep 2023 19:56:41 +0300 Subject: [PATCH 1/6] updated NC versions, pinned checkout action to number. Signed-off-by: Alexander Piskun --- .github/workflows/analysis-coverage.yml | 60 ++++++++++++------------- .github/workflows/docs-check.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/publish.yml | 4 +- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/analysis-coverage.yml b/.github/workflows/analysis-coverage.yml index a56b2d88..f18d36e4 100644 --- a/.github/workflows/analysis-coverage.yml +++ b/.github/workflows/analysis-coverage.yml @@ -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" @@ -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" @@ -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 @@ -118,7 +118,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 @@ -138,7 +138,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 @@ -197,11 +197,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: @@ -264,7 +264,7 @@ jobs: php -S localhost:8080 & - name: Checkout NcPyApi - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + uses: actions/checkout@v4 with: path: nc_py_api @@ -273,7 +273,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 @@ -295,7 +295,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 @@ -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" ] @@ -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 @@ -417,7 +417,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 @@ -501,14 +501,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" @@ -528,7 +528,7 @@ jobs: php -S localhost:8080 & - name: Checkout NcPyApi - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + uses: actions/checkout@v4 with: path: nc_py_api @@ -537,7 +537,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 @@ -556,7 +556,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 @@ -640,21 +640,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" @@ -675,7 +675,7 @@ jobs: php -S localhost:8080 & - name: Checkout NcPyApi - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + uses: actions/checkout@v4 with: path: nc_py_api @@ -684,7 +684,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 @@ -756,21 +756,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 }} @@ -791,7 +791,7 @@ jobs: php -S localhost:8080 & - name: Checkout NcPyApi - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + uses: actions/checkout@v4 with: path: nc_py_api @@ -800,7 +800,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 @@ -823,7 +823,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 diff --git a/.github/workflows/docs-check.yml b/.github/workflows/docs-check.yml index 17669227..1079e6d0 100644 --- a/.github/workflows/docs-check.yml +++ b/.github/workflows/docs-check.yml @@ -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' diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index f434fd52..9226f40c 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -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' diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 872703ac..9e4eb5c9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -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: @@ -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) From 7bc59855bf14b40aec1fb93600031e516fa66508 Mon Sep 17 00:00:00 2001 From: Alexander Piskun Date: Sat, 23 Sep 2023 20:25:43 +0300 Subject: [PATCH 2/6] fixed CI, NC 27.1 already includes AppAPI patch Signed-off-by: Alexander Piskun --- .github/workflows/analysis-coverage.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/analysis-coverage.yml b/.github/workflows/analysis-coverage.yml index f18d36e4..d0663ab0 100644 --- a/.github/workflows/analysis-coverage.yml +++ b/.github/workflows/analysis-coverage.yml @@ -123,9 +123,12 @@ jobs: path: apps/app_api repository: cloud-py-api/app_api + - name: Patch base.php + if: ${{ startsWith(matrix.nextcloud, 'stable26') }} + 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 & @@ -282,7 +285,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 & @@ -424,7 +426,6 @@ jobs: - 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 & From fcbfab2b04e0f569ab68064ffddf72d5349105fb Mon Sep 17 00:00:00 2001 From: Alexander Piskun Date: Sat, 23 Sep 2023 20:53:17 +0300 Subject: [PATCH 3/6] fixed CI, NC 27.1 already includes AppAPI patch(2) Signed-off-by: Alexander Piskun --- .github/workflows/analysis-coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/analysis-coverage.yml b/.github/workflows/analysis-coverage.yml index d0663ab0..999fe7a0 100644 --- a/.github/workflows/analysis-coverage.yml +++ b/.github/workflows/analysis-coverage.yml @@ -124,7 +124,7 @@ jobs: repository: cloud-py-api/app_api - name: Patch base.php - if: ${{ startsWith(matrix.nextcloud, 'stable26') }} + if: ${{ startsWith(matrix.nextcloud, '26') }} run: patch -p 1 -i apps/app_api/base_php.patch - name: Install AppAPI From ad41ef4d7b83ddb54fe8d420f59a89dfbf305d0b Mon Sep 17 00:00:00 2001 From: Alexander Piskun Date: Sat, 23 Sep 2023 21:36:13 +0300 Subject: [PATCH 4/6] testing if NC Talk is Ok now Signed-off-by: Alexander Piskun --- .github/workflows/analysis-coverage.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/analysis-coverage.yml b/.github/workflows/analysis-coverage.yml index 999fe7a0..13457e35 100644 --- a/.github/workflows/analysis-coverage.yml +++ b/.github/workflows/analysis-coverage.yml @@ -153,9 +153,9 @@ jobs: make dev-setup 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: 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 working-directory: nc_py_api From 8ea283fe91adace29f681e94751662ae2f4d1f38 Mon Sep 17 00:00:00 2001 From: Alexander Piskun Date: Sat, 23 Sep 2023 21:57:30 +0300 Subject: [PATCH 5/6] testing if NC Talk is Ok now(2) Signed-off-by: Alexander Piskun --- .github/workflows/analysis-coverage.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/analysis-coverage.yml b/.github/workflows/analysis-coverage.yml index 13457e35..97027574 100644 --- a/.github/workflows/analysis-coverage.yml +++ b/.github/workflows/analysis-coverage.yml @@ -153,9 +153,9 @@ jobs: make dev-setup make build-js -# - name: Enable Talk + - name: Enable Talk # if: ${{ !startsWith(matrix.nextcloud, '27.') }} # for some reason, currently Talk fails with 27.0.2 -# run: php occ app:enable spreed + run: php occ app:enable spreed - name: Generate coverage report working-directory: nc_py_api From a02565cfae7e51d47b581e56699941cb42729fab Mon Sep 17 00:00:00 2001 From: Alexander Piskun Date: Sat, 23 Sep 2023 22:25:47 +0300 Subject: [PATCH 6/6] Enabled testing Talk for 27.1 version Signed-off-by: Alexander Piskun --- .github/workflows/analysis-coverage.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/analysis-coverage.yml b/.github/workflows/analysis-coverage.yml index 97027574..52afca1e 100644 --- a/.github/workflows/analysis-coverage.yml +++ b/.github/workflows/analysis-coverage.yml @@ -154,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 @@ -310,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