Skip to content

Commit

Permalink
feat: maintenance update, basic object storage support, minor cleanup (
Browse files Browse the repository at this point in the history
  • Loading branch information
andrey18106 authored Oct 21, 2024
1 parent c8da3ef commit c19d8da
Show file tree
Hide file tree
Showing 41 changed files with 9,768 additions and 11,603 deletions.
62 changes: 40 additions & 22 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,14 @@ jobs:
xml-schema-file: ./info.xsd

php-lint:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: php-lint
strategy:
matrix:
php-versions: ["7.4", "8.0", "8.1"]

name: php-lint
php-versions: ["8.1", "8.2"]

steps:
- name: Checkout
uses: actions/checkout@v3
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4

- name: Set up php ${{ matrix.php-versions }}
uses: shivammathur/setup-php@v2
Expand All @@ -59,17 +57,19 @@ jobs:
run: composer run lint

php-cs:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: php-cs
strategy:
matrix:
php-versions: [ "8.1", "8.2" ]

steps:
- name: Checkout
uses: actions/checkout@v3
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4

- name: Set up php ${{ matrix.php-versions }}
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
php-version: ${{ matrix.php-versions }}
coverage: none

- name: Install dependencies
Expand All @@ -79,32 +79,50 @@ jobs:
run: composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 )

php-psalm-analysis:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
php-versions: ["7.4", "8.0", "8.1"]
ocp-version: ['v24.0.1']
php-versions: [ "8.1", "8.2" ]
server-versions: [ '30.0.0' ]
name: php-psalm-analysis

steps:
- name: Cache nextcloud server
id: nextcloud_setup
uses: actions/cache@v3
with:
path: nextcloud-${{ matrix.server-versions }}.zip
key: ${{ matrix.server-versions }}

- name: Download nextcloud ${{ matrix.server-versions }}
if: steps.nextcloud_setup.outputs.cache-hit != 'true'
continue-on-error: true
id: server-checkout
run: |
NCVERSION=${{ matrix.server-versions }}
wget --quiet https://download.nextcloud.com/server/releases/latest-$NCVERSION.zip
unzip latest-$NCVERSION.zip
- uses: actions/checkout@v3

- name: Set up php ${{ matrix.php-versions }}
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
php-version: ${{ matrix.php-versions }}
coverage: none

- name: Install dependencies
run: composer i

- name: Install nextcloud/ocp
run: composer require --dev nextcloud/ocp:${{ matrix.ocp-version }}

- name: Run coding standards check
run: composer run psalm

php-security-analysis:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
contents: read
actions: read
security-events: write
name: security analysis
steps:
- uses: actions/checkout@v3
Expand All @@ -124,24 +142,24 @@ jobs:
sarif_file: results.sarif

js-eslint:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: eslint

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- name: Install dependencies
run: npm ci

- name: ESLint
run: npm run lint

stylelint:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

name: stylelint

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- name: Install dependencies
run: npm ci

Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/py_analysis-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ jobs:
strategy:
fail-fast: false
matrix:
nextcloud: [ "25.0.2" ]
php-version: [ "7.4", "8.0" ]
nextcloud: [ "30.0.0" ]
php-version: [ "8.1", "8.2" ]
pgsql-version: [ "13", "15" ]
env:
NC_dbname: nextcloud_abz
Expand Down Expand Up @@ -141,8 +141,8 @@ jobs:
strategy:
fail-fast: false
matrix:
nextcloud: [ "25.0.2" ]
php-version: [ "7.4", "8.0" ]
nextcloud: [ "30.0.0" ]
php-version: [ "8.1", "8.2" ]
mysql-version: [ "8" ]

services:
Expand Down Expand Up @@ -235,8 +235,8 @@ jobs:
strategy:
fail-fast: false
matrix:
nextcloud: [ "25.0.2" ]
php-version: [ "7.4", "8.0" ]
nextcloud: [ "30.0.0" ]
php-version: [ "8.1", "8.2" ]
mariadb-version: [ "10.3", "10.10" ]

services:
Expand Down Expand Up @@ -329,8 +329,8 @@ jobs:
strategy:
fail-fast: false
matrix:
php-version: [ "7.4", "8.0" ]
nextcloud: [ "25.0.2" ]
nextcloud: [ "30.0.0" ]
php-version: [ "8.1", "8.2" ]

steps:
- name: Set up php ${{ matrix.php-version }}
Expand Down Expand Up @@ -412,8 +412,8 @@ jobs:
strategy:
fail-fast: false
matrix:
php-version: [ "8.0" ]
nextcloud: [ "25.0.2" ]
nextcloud: [ "30.0.0" ]
php-version: [ "8.1" ]

steps:
- name: Set up php ${{ matrix.php-version }}
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
name: Test

on:
pull_request:
branches:
- main
- dev
paths-ignore:
- l10n/**
push:
branches:
- main
- dev
paths-ignore:
- l10n/**
# pull_request:
# branches:
# - main
# - dev
# paths-ignore:
# - l10n/**
# push:
# branches:
# - main
# - dev
# paths-ignore:
# - l10n/**
workflow_dispatch:

env:
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

All notable changes to this project will be documented in this file.

## [0.2.0 - 2024-10-20]

Maintenance update. Update NC versions to support NC30+ only.

### Added

- Added basic ObjectStorage support (/tmp folder used to execute binary scripts)

## [0.1.9 - 2023-12-14]

Maintenance update.
Expand Down
4 changes: 2 additions & 2 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Nextcloud Python API Framework
- [MediaDC](https://apps.nextcloud.com/apps/mediadc) - Nextcloud Media Duplicate Collector app
]]>
</description>
<version>0.1.9</version>
<version>0.2.0</version>
<licence>agpl</licence>
<author mail="[email protected]" homepage="https://github.com/andrey18106">Andrey Borysenko</author>
<author mail="[email protected]" homepage="https://github.com/bigcat88">Alexander Piskun</author>
Expand All @@ -37,7 +37,7 @@ Nextcloud Python API Framework
<repository type="git">https://github.com/cloud-py-api/cloud_py_api</repository>
<dependencies>
<php min-version="7.4" min-int-size="64" />
<nextcloud min-version="28" max-version="29" />
<nextcloud min-version="30" max-version="31" />
</dependencies>
<repair-steps>
<post-migration>
Expand Down
18 changes: 14 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
"require-dev": {
"nextcloud/ocp": "dev-master",
"roave/security-advisories": "dev-master",
"psalm/phar": "4.30.0",
"psalm/phar": "^5.15",
"phpunit/phpunit": "^9.5",
"nextcloud/coding-standard": "^1.0",
"friendsofphp/php-cs-fixer": "^3.13",
"nextcloud/coding-standard": "^1.1",
"friendsofphp/php-cs-fixer": "^3.16",
"php-mock/php-mock-phpunit": "^2.6"
},
"scripts": {
Expand All @@ -42,7 +42,17 @@
"optimize-autoloader": true,
"classmap-authoritative": true,
"platform": {
"php": "7.4"
"php": "8.1"
}
},
"autoload": {
"psr-4": {
"OCA\\Cloud_Py_API\\": "lib/"
}
},
"autoload-dev": {
"psr-4": {
"OCP\\": "vendor/nextcloud/ocp/OCP"
}
}
}
Loading

0 comments on commit c19d8da

Please sign in to comment.