Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/files_automatedtagging.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/lint-php.yml12
-rw-r--r--.github/workflows/phpunit-mysql.yml30
-rw-r--r--.github/workflows/phpunit-oci.yml32
-rw-r--r--.github/workflows/phpunit-pgsql.yml32
-rw-r--r--.github/workflows/phpunit-sqlite.yml30
-rw-r--r--composer.lock8
-rw-r--r--l10n/uk.js2
-rw-r--r--l10n/uk.json2
-rw-r--r--package-lock.json18
-rw-r--r--package.json2
10 files changed, 119 insertions, 49 deletions
diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml
index d089d1b..738bc99 100644
--- a/.github/workflows/lint-php.yml
+++ b/.github/workflows/lint-php.yml
@@ -5,17 +5,15 @@
name: Lint
-on:
- pull_request:
- push:
- branches:
- - main
- - master
- - stable*
+on: pull_request
permissions:
contents: read
+concurrency:
+ group: lint-php-${{ github.head_ref || github.run_id }}
+ cancel-in-progress: true
+
jobs:
php-lint:
runs-on: ubuntu-latest
diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
index db0460e..a59a3f0 100644
--- a/.github/workflows/phpunit-mysql.yml
+++ b/.github/workflows/phpunit-mysql.yml
@@ -7,15 +7,25 @@ name: PHPUnit
on:
pull_request:
- push:
- branches:
- - main
- - master
- - stable*
+ paths:
+ - '.github/workflows/**'
+ - 'appinfo/**'
+ - 'lib/**'
+ - 'templates/**'
+ - 'tests/**'
+ - 'vendor/**'
+ - 'vendor-bin/**'
+ - '.php-cs-fixer.dist.php'
+ - 'composer.json'
+ - 'composer.lock'
permissions:
contents: read
+concurrency:
+ group: phpunit-mysql-${{ github.head_ref || github.run_id }}
+ cancel-in-progress: true
+
env:
# Location of the phpunit.xml and phpunit.integration.xml files
PHPUNIT_CONFIG: ./tests/phpunit.xml
@@ -70,7 +80,15 @@ jobs:
extensions: mbstring, iconv, fileinfo, intl, mysql, pdo_mysql
coverage: none
+ - name: Check composer file existence
+ id: check_composer
+ uses: andstor/file-existence-action@v1
+ with:
+ files: apps/${{ env.APP_NAME }}/composer.json
+
- name: Set up PHPUnit
+ # Only run if phpunit config file exists
+ if: steps.check_composer.outputs.files_exists == 'true'
working-directory: apps/${{ env.APP_NAME }}
run: composer i
@@ -80,7 +98,7 @@ jobs:
run: |
mkdir data
./occ maintenance:install --verbose --database=mysql --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password
- ./occ app:enable ${{ env.APP_NAME }}
+ ./occ app:enable --force ${{ env.APP_NAME }}
- name: Check PHPUnit config file existence
id: check_phpunit
diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml
index 1ff3388..f51711b 100644
--- a/.github/workflows/phpunit-oci.yml
+++ b/.github/workflows/phpunit-oci.yml
@@ -7,15 +7,25 @@ name: PHPUnit
on:
pull_request:
- push:
- branches:
- - main
- - master
- - stable*
+ paths:
+ - '.github/workflows/**'
+ - 'appinfo/**'
+ - 'lib/**'
+ - 'templates/**'
+ - 'tests/**'
+ - 'vendor/**'
+ - 'vendor-bin/**'
+ - '.php-cs-fixer.dist.php'
+ - 'composer.json'
+ - 'composer.lock'
permissions:
contents: read
+concurrency:
+ group: phpunit-oci-${{ github.head_ref || github.run_id }}
+ cancel-in-progress: true
+
env:
# Location of the phpunit.xml and phpunit.integration.xml files
PHPUNIT_CONFIG: ./tests/phpunit.xml
@@ -23,7 +33,7 @@ env:
jobs:
phpunit-oci:
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-latest
strategy:
matrix:
@@ -62,7 +72,15 @@ jobs:
tools: phpunit
coverage: none
+ - name: Check composer file existence
+ id: check_composer
+ uses: andstor/file-existence-action@v1
+ with:
+ files: apps/${{ env.APP_NAME }}/composer.json
+
- name: Set up PHPUnit
+ # Only run if phpunit config file exists
+ if: steps.check_composer.outputs.files_exists == 'true'
working-directory: apps/${{ env.APP_NAME }}
run: composer i
@@ -72,7 +90,7 @@ jobs:
run: |
mkdir data
./occ maintenance:install --verbose --database=oci --database-name=XE --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=autotest --database-pass=owncloud --admin-user admin --admin-pass admin
- ./occ app:enable ${{ env.APP_NAME }}
+ ./occ app:enable --force ${{ env.APP_NAME }}
- name: Check PHPUnit config file existence
id: check_phpunit
diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml
index 1596c11..3f39059 100644
--- a/.github/workflows/phpunit-pgsql.yml
+++ b/.github/workflows/phpunit-pgsql.yml
@@ -7,15 +7,25 @@ name: PHPUnit
on:
pull_request:
- push:
- branches:
- - main
- - master
- - stable*
+ paths:
+ - '.github/workflows/**'
+ - 'appinfo/**'
+ - 'lib/**'
+ - 'templates/**'
+ - 'tests/**'
+ - 'vendor/**'
+ - 'vendor-bin/**'
+ - '.php-cs-fixer.dist.php'
+ - 'composer.json'
+ - 'composer.lock'
permissions:
contents: read
+concurrency:
+ group: phpunit-pgsql-${{ github.head_ref || github.run_id }}
+ cancel-in-progress: true
+
env:
# Location of the phpunit.xml and phpunit.integration.xml files
PHPUNIT_CONFIG: ./tests/phpunit.xml
@@ -32,7 +42,7 @@ jobs:
services:
postgres:
- image: postgres
+ image: postgres:14
ports:
- 4444:5432/tcp
env:
@@ -67,7 +77,15 @@ jobs:
extensions: mbstring, iconv, fileinfo, intl, pgsql, pdo_pgsql
coverage: none
+ - name: Check composer file existence
+ id: check_composer
+ uses: andstor/file-existence-action@v1
+ with:
+ files: apps/${{ env.APP_NAME }}/composer.json
+
- name: Set up PHPUnit
+ # Only run if phpunit config file exists
+ if: steps.check_composer.outputs.files_exists == 'true'
working-directory: apps/${{ env.APP_NAME }}
run: composer i
@@ -77,7 +95,7 @@ jobs:
run: |
mkdir data
./occ maintenance:install --verbose --database=pgsql --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password
- ./occ app:enable ${{ env.APP_NAME }}
+ ./occ app:enable --force ${{ env.APP_NAME }}
- name: Check PHPUnit config file existence
id: check_phpunit
diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml
index 700b361..296d55a 100644
--- a/.github/workflows/phpunit-sqlite.yml
+++ b/.github/workflows/phpunit-sqlite.yml
@@ -7,15 +7,25 @@ name: PHPUnit
on:
pull_request:
- push:
- branches:
- - main
- - master
- - stable*
+ paths:
+ - '.github/workflows/**'
+ - 'appinfo/**'
+ - 'lib/**'
+ - 'templates/**'
+ - 'tests/**'
+ - 'vendor/**'
+ - 'vendor-bin/**'
+ - '.php-cs-fixer.dist.php'
+ - 'composer.json'
+ - 'composer.lock'
permissions:
contents: read
+concurrency:
+ group: phpunit-sqlite-${{ github.head_ref || github.run_id }}
+ cancel-in-progress: true
+
env:
# Location of the phpunit.xml and phpunit.integration.xml files
PHPUNIT_CONFIG: ./tests/phpunit.xml
@@ -56,7 +66,15 @@ jobs:
extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite
coverage: none
+ - name: Check composer file existence
+ id: check_composer
+ uses: andstor/file-existence-action@v1
+ with:
+ files: apps/${{ env.APP_NAME }}/composer.json
+
- name: Set up PHPUnit
+ # Only run if phpunit config file exists
+ if: steps.check_composer.outputs.files_exists == 'true'
working-directory: apps/${{ env.APP_NAME }}
run: composer i
@@ -66,7 +84,7 @@ jobs:
run: |
mkdir data
./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password
- ./occ app:enable ${{ env.APP_NAME }}
+ ./occ app:enable --force ${{ env.APP_NAME }}
- name: Check PHPUnit config file existence
id: check_phpunit
diff --git a/composer.lock b/composer.lock
index 671f99b..0aa24df 100644
--- a/composer.lock
+++ b/composer.lock
@@ -639,12 +639,12 @@
"source": {
"type": "git",
"url": "https://github.com/nextcloud-deps/ocp.git",
- "reference": "2918f41059308f6ff088babc8b02e27765cb5a83"
+ "reference": "c564b7c4cae07ebf8cb02a84ac49b3a24b6e6d8c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/2918f41059308f6ff088babc8b02e27765cb5a83",
- "reference": "2918f41059308f6ff088babc8b02e27765cb5a83",
+ "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/c564b7c4cae07ebf8cb02a84ac49b3a24b6e6d8c",
+ "reference": "c564b7c4cae07ebf8cb02a84ac49b3a24b6e6d8c",
"shasum": ""
},
"require": {
@@ -675,7 +675,7 @@
"issues": "https://github.com/nextcloud-deps/ocp/issues",
"source": "https://github.com/nextcloud-deps/ocp/tree/master"
},
- "time": "2022-10-05T00:59:28+00:00"
+ "time": "2022-10-15T00:56:00+00:00"
},
{
"name": "nikic/php-parser",
diff --git a/l10n/uk.js b/l10n/uk.js
index d9f7636..69e5fca 100644
--- a/l10n/uk.js
+++ b/l10n/uk.js
@@ -7,7 +7,7 @@ OC.L10N.register(
"Automated tagging" : "Автоматичне встановлення позначок",
"Automated tagging of files" : "Автоматичне встановлення позначок для файлів",
"File is changed" : "Файл змінено",
- "Automatically tag files based on factors such as filetype, user group memberships, time and more." : "Автоматично позначайте файли на основі таких факторів, як тип файлу, членство в групах користувачів, час тощо.",
+ "Automatically tag files based on factors such as filetype, user group memberships, time and more." : "Автоматично позначайте файли на основі таких факторів, як тип файлу, участь в групах користувачів, час тощо.",
"Each rule group consists of one or more rules. A request matches a group if all rules evaluate to true. On uploading a file all defined groups are evaluated and when matching, the given collaborative tags are assigned to the file." : "Кожна група правил складається з одного або кількох правил. Запит відповідає групі, якщо всі правила оцінюються як істинні. Під час завантаження файлу оцінюються всі визначені групи, і під час зіставлення файлу призначаються дані спільні теги.",
"Files automated tagging" : "Автоматичне встановлення позначок для файлів",
"Automatically assign collaborative tags to files based on conditions" : "Автоматично призначайте файлам спільні теги відповідно до умов",
diff --git a/l10n/uk.json b/l10n/uk.json
index 2886c65..c96baf8 100644
--- a/l10n/uk.json
+++ b/l10n/uk.json
@@ -5,7 +5,7 @@
"Automated tagging" : "Автоматичне встановлення позначок",
"Automated tagging of files" : "Автоматичне встановлення позначок для файлів",
"File is changed" : "Файл змінено",
- "Automatically tag files based on factors such as filetype, user group memberships, time and more." : "Автоматично позначайте файли на основі таких факторів, як тип файлу, членство в групах користувачів, час тощо.",
+ "Automatically tag files based on factors such as filetype, user group memberships, time and more." : "Автоматично позначайте файли на основі таких факторів, як тип файлу, участь в групах користувачів, час тощо.",
"Each rule group consists of one or more rules. A request matches a group if all rules evaluate to true. On uploading a file all defined groups are evaluated and when matching, the given collaborative tags are assigned to the file." : "Кожна група правил складається з одного або кількох правил. Запит відповідає групі, якщо всі правила оцінюються як істинні. Під час завантаження файлу оцінюються всі визначені групи, і під час зіставлення файлу призначаються дані спільні теги.",
"Files automated tagging" : "Автоматичне встановлення позначок для файлів",
"Automatically assign collaborative tags to files based on conditions" : "Автоматично призначайте файлам спільні теги відповідно до умов",
diff --git a/package-lock.json b/package-lock.json
index 46b90c1..0115c0f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "files_automatedtagging",
- "version": "1.15.0",
+ "version": "1.16.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "files_automatedtagging",
- "version": "1.15.0",
+ "version": "1.16.0",
"license": "agpl",
"dependencies": {
"@nextcloud/l10n": "^1.6.0",
@@ -17,7 +17,7 @@
"@nextcloud/babel-config": "^1.0.0",
"@nextcloud/browserslist-config": "^2.3.0",
"@nextcloud/eslint-config": "^8.1.2",
- "@nextcloud/stylelint-config": "^2.2.0",
+ "@nextcloud/stylelint-config": "^2.3.0",
"@nextcloud/webpack-vue-config": "^5.3.0",
"vue-template-compiler": "^2.7.10"
},
@@ -1961,9 +1961,9 @@
}
},
"node_modules/@nextcloud/stylelint-config": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/@nextcloud/stylelint-config/-/stylelint-config-2.2.0.tgz",
- "integrity": "sha512-kH3pGAofdnDZJCTyYr2hc9Y63KVVrJ3845j3DOKJNW4uUVybiRZkMccwuJvT1mJ8Gn7lgETh4vceDXuwnJlJ3Q==",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/@nextcloud/stylelint-config/-/stylelint-config-2.3.0.tgz",
+ "integrity": "sha512-5mtWqqwrXFXekGT0I8PtVYxJAUQXYwMF28e2MBFbsbyCv+XVzFn9rOYAn6xUG1PrsIeEnom0xlQdrrjpJc71oA==",
"dev": true,
"engines": {
"node": "^16.0.0",
@@ -14977,9 +14977,9 @@
}
},
"@nextcloud/stylelint-config": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/@nextcloud/stylelint-config/-/stylelint-config-2.2.0.tgz",
- "integrity": "sha512-kH3pGAofdnDZJCTyYr2hc9Y63KVVrJ3845j3DOKJNW4uUVybiRZkMccwuJvT1mJ8Gn7lgETh4vceDXuwnJlJ3Q==",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/@nextcloud/stylelint-config/-/stylelint-config-2.3.0.tgz",
+ "integrity": "sha512-5mtWqqwrXFXekGT0I8PtVYxJAUQXYwMF28e2MBFbsbyCv+XVzFn9rOYAn6xUG1PrsIeEnom0xlQdrrjpJc71oA==",
"dev": true,
"requires": {}
},
diff --git a/package.json b/package.json
index 8803162..a28a844 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
"@nextcloud/babel-config": "^1.0.0",
"@nextcloud/browserslist-config": "^2.3.0",
"@nextcloud/eslint-config": "^8.1.2",
- "@nextcloud/stylelint-config": "^2.2.0",
+ "@nextcloud/stylelint-config": "^2.3.0",
"@nextcloud/webpack-vue-config": "^5.3.0",
"vue-template-compiler": "^2.7.10"
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 11:28:24 +0300