diff options
-rw-r--r-- | .github/workflows/jest.yml | 8 | ||||
-rw-r--r-- | .github/workflows/lint-eslint.yml | 9 | ||||
-rw-r--r-- | .github/workflows/lint-info-xml.yml | 8 | ||||
-rw-r--r-- | .github/workflows/lint-php-cs.yml | 8 | ||||
-rw-r--r-- | .github/workflows/lint-php.yml | 8 | ||||
-rw-r--r-- | .github/workflows/lint-stylelint.yml | 8 | ||||
-rw-r--r-- | .github/workflows/node.yml | 9 | ||||
-rw-r--r-- | .github/workflows/phpunit.yml | 7 | ||||
-rw-r--r-- | .github/workflows/psalm.yml | 9 | ||||
-rw-r--r-- | package-lock.json | 14 | ||||
-rw-r--r-- | package.json | 2 |
11 files changed, 43 insertions, 47 deletions
diff --git a/.github/workflows/jest.yml b/.github/workflows/jest.yml index e115d67ab..238c8fe4b 100644 --- a/.github/workflows/jest.yml +++ b/.github/workflows/jest.yml @@ -2,10 +2,10 @@ name: Jest on: pull_request: - push: - branches: - - master - - stable* + +concurrency: + group: jest-${{ github.head_ref || github.run_id }} + cancel-in-progress: true jobs: build: diff --git a/.github/workflows/lint-eslint.yml b/.github/workflows/lint-eslint.yml index 5f48fb58b..f3592a01d 100644 --- a/.github/workflows/lint-eslint.yml +++ b/.github/workflows/lint-eslint.yml @@ -7,11 +7,10 @@ name: Lint on: pull_request: - push: - branches: - - main - - master - - stable* + +concurrency: + group: lint-eslint-${{ github.head_ref || github.run_id }} + cancel-in-progress: true jobs: lint: diff --git a/.github/workflows/lint-info-xml.yml b/.github/workflows/lint-info-xml.yml index cea2a2bc7..726b7f6ad 100644 --- a/.github/workflows/lint-info-xml.yml +++ b/.github/workflows/lint-info-xml.yml @@ -7,10 +7,10 @@ name: Lint on: pull_request: - push: - branches: - - master - - stable* + +concurrency: + group: lint-info-xml-${{ github.head_ref || github.run_id }} + cancel-in-progress: true jobs: xml-linters: diff --git a/.github/workflows/lint-php-cs.yml b/.github/workflows/lint-php-cs.yml index 9aad51409..425443dab 100644 --- a/.github/workflows/lint-php-cs.yml +++ b/.github/workflows/lint-php-cs.yml @@ -7,10 +7,10 @@ name: Lint on: pull_request: - push: - branches: - - master - - stable* + +concurrency: + group: lint-php-cs-${{ github.head_ref || github.run_id }} + cancel-in-progress: true jobs: lint: diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml index 9cfb484e9..a19e22871 100644 --- a/.github/workflows/lint-php.yml +++ b/.github/workflows/lint-php.yml @@ -7,10 +7,10 @@ name: Lint on: pull_request: - push: - branches: - - master - - stable* + +concurrency: + group: lint-php-${{ github.head_ref || github.run_id }} + cancel-in-progress: true jobs: php-lint: diff --git a/.github/workflows/lint-stylelint.yml b/.github/workflows/lint-stylelint.yml index 64edcfba5..62909e43c 100644 --- a/.github/workflows/lint-stylelint.yml +++ b/.github/workflows/lint-stylelint.yml @@ -7,10 +7,10 @@ name: Lint on: pull_request: - push: - branches: - - master - - stable* + +concurrency: + group: lint-stylelint-${{ github.head_ref || github.run_id }} + cancel-in-progress: true jobs: lint: diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml index 9150d1f19..7ccac97a4 100644 --- a/.github/workflows/node.yml +++ b/.github/workflows/node.yml @@ -7,15 +7,14 @@ name: Node on: pull_request: - push: - branches: - - main - - master - - stable* permissions: contents: read +concurrency: + group: node-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + jobs: build: runs-on: ubuntu-latest diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index e5e1e5d7a..1310a9fcb 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -12,10 +12,9 @@ on: - 'composer.json' - 'composer.lock' - push: - branches: - - master - - stable* +concurrency: + group: phpunit-${{ github.head_ref || github.run_id }} + cancel-in-progress: true env: APP_NAME: spreed diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml index ff271c1e7..79bdcc09c 100644 --- a/.github/workflows/psalm.yml +++ b/.github/workflows/psalm.yml @@ -2,11 +2,10 @@ name: Static analysis on: pull_request: - push: - branches: - - master - - main - - stable* + +concurrency: + group: psalm-${{ github.head_ref || github.run_id }} + cancel-in-progress: true jobs: static-analysis: diff --git a/package-lock.json b/package-lock.json index b1312c239..6f4a18e4c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "@nextcloud/moment": "^1.2.1", "@nextcloud/paths": "^2.1.0", "@nextcloud/router": "^2.0.0", - "@nextcloud/vue": "^7.0.0-beta.7", + "@nextcloud/vue": "^7.0.0", "@nextcloud/vue-dashboard": "^2.0.1", "@nextcloud/vue-richtext": "^2.0.4", "attachmediastream": "^2.1.0", @@ -2988,9 +2988,9 @@ } }, "node_modules/@nextcloud/vue": { - "version": "7.0.0-beta.7", - "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-7.0.0-beta.7.tgz", - "integrity": "sha512-PCyTMljVvEUjkFWs56LPF9HCh0hVPVSRMxTq5TEdCnEUysb+Ku3l4IzQyfAjD6CmsmauiKahNZBFh+Qg7gqxdA==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-7.0.0.tgz", + "integrity": "sha512-x+JAWCdL30qpxx4u4Ggdlg+l33f8ajX/qP5mZ3o4fshSDSZnz+d8kvnPoQXC6zRcdvNKzpgzCFe80I+G0q/QRQ==", "dependencies": { "@nextcloud/auth": "^2.0.0", "@nextcloud/axios": "^2.0.0", @@ -22256,9 +22256,9 @@ } }, "@nextcloud/vue": { - "version": "7.0.0-beta.7", - "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-7.0.0-beta.7.tgz", - "integrity": "sha512-PCyTMljVvEUjkFWs56LPF9HCh0hVPVSRMxTq5TEdCnEUysb+Ku3l4IzQyfAjD6CmsmauiKahNZBFh+Qg7gqxdA==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-7.0.0.tgz", + "integrity": "sha512-x+JAWCdL30qpxx4u4Ggdlg+l33f8ajX/qP5mZ3o4fshSDSZnz+d8kvnPoQXC6zRcdvNKzpgzCFe80I+G0q/QRQ==", "requires": { "@nextcloud/auth": "^2.0.0", "@nextcloud/axios": "^2.0.0", diff --git a/package.json b/package.json index 67e4589e3..8a1ed29e1 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "@nextcloud/moment": "^1.2.1", "@nextcloud/paths": "^2.1.0", "@nextcloud/router": "^2.0.0", - "@nextcloud/vue": "^7.0.0-beta.7", + "@nextcloud/vue": "^7.0.0", "@nextcloud/vue-dashboard": "^2.0.1", "@nextcloud/vue-richtext": "^2.0.4", "attachmediastream": "^2.1.0", |