Merge remote-tracking branch 'remotes/origin/master' into develop

# Conflicts:
#	.github/workflows/lint-go.yml
This commit is contained in:
Sergey Linnik
2024-11-21 13:27:37 +03:00
9 changed files with 17 additions and 17 deletions

View File

@ -3,10 +3,10 @@ name: Golangci
on: on:
workflow_dispatch: workflow_dispatch:
push: push:
branches: [master, main] branches: [master]
paths: ['web/documentserver-example/go/**'] paths: ['web/documentserver-example/go/**']
pull_request: pull_request:
branches: [master, main, develop] branches: [master, develop]
paths: ['web/documentserver-example/go/**'] paths: ['web/documentserver-example/go/**']
jobs: jobs:

View File

@ -3,10 +3,10 @@ name: Lint Java
on: on:
workflow_dispatch: workflow_dispatch:
push: push:
branches: [master, main] branches: [master]
paths: ['web/documentserver-example/java/**'] paths: ['web/documentserver-example/java/**']
pull_request: pull_request:
branches: [master, main, develop] branches: [master, develop]
paths: ['web/documentserver-example/java/**'] paths: ['web/documentserver-example/java/**']
jobs: jobs:

View File

@ -3,10 +3,10 @@ name: ESLint
on: on:
workflow_dispatch: workflow_dispatch:
push: push:
branches: [master, main] branches: [master]
paths: ['web/documentserver-example/nodejs/**'] paths: ['web/documentserver-example/nodejs/**']
pull_request: pull_request:
branches: [master, main, develop] branches: [master, develop]
paths: ['web/documentserver-example/nodejs/**'] paths: ['web/documentserver-example/nodejs/**']
env: env:

View File

@ -3,10 +3,10 @@ name: Laravel Pint
on: on:
workflow_dispatch: workflow_dispatch:
push: push:
branches: [master, main] branches: [master]
paths: ['web/documentserver-example/php-laravel/**'] paths: ['web/documentserver-example/php-laravel/**']
pull_request: pull_request:
branches: [master, main, develop] branches: [master, develop]
paths: ['web/documentserver-example/php-laravel/**'] paths: ['web/documentserver-example/php-laravel/**']
jobs: jobs:

View File

@ -3,10 +3,10 @@ name: PHPCs
on: on:
workflow_dispatch: workflow_dispatch:
push: push:
branches: [master, main] branches: [master]
paths: ['web/documentserver-example/php/**'] paths: ['web/documentserver-example/php/**']
pull_request: pull_request:
branches: [master, main, develop] branches: [master, develop]
paths: ['web/documentserver-example/php/**'] paths: ['web/documentserver-example/php/**']
jobs: jobs:

View File

@ -3,10 +3,10 @@ name: PyLint
on: on:
workflow_dispatch: workflow_dispatch:
push: push:
branches: [master, main] branches: [master]
paths: ['web/documentserver-example/python/**'] paths: ['web/documentserver-example/python/**']
pull_request: pull_request:
branches: [master, main, develop] branches: [master, develop]
paths: ['web/documentserver-example/python/**'] paths: ['web/documentserver-example/python/**']
jobs: jobs:

View File

@ -3,10 +3,10 @@ name: Rubocop
on: on:
workflow_dispatch: workflow_dispatch:
push: push:
branches: [master, main] branches: [master]
paths: ['web/documentserver-example/ruby/**'] paths: ['web/documentserver-example/ruby/**']
pull_request: pull_request:
branches: [master, main, develop] branches: [master, develop]
paths: ['web/documentserver-example/ruby/**'] paths: ['web/documentserver-example/ruby/**']
jobs: jobs:

View File

@ -3,10 +3,10 @@ name: Lint Spring
on: on:
workflow_dispatch: workflow_dispatch:
push: push:
branches: [master, main] branches: [master]
paths: ['web/documentserver-example/java-spring/**'] paths: ['web/documentserver-example/java-spring/**']
pull_request: pull_request:
branches: [master, main, develop] branches: [master, develop]
paths: ['web/documentserver-example/java-spring/**'] paths: ['web/documentserver-example/java-spring/**']
jobs: jobs:

View File

@ -2,7 +2,7 @@ name: Release
on: on:
push: push:
branches: [master,main] branches: [master]
permissions: permissions:
contents: write contents: write