From 29c028029545b8585245936d9b29f66a4d3fb4db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6?= Date: Fri, 7 Apr 2023 08:27:06 +0200 Subject: [PATCH] feat(actions): also test doc build on pull requests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ --- .github/workflows/documentation.yml | 6 +++++ package-lock.json | 35 +++++++++++++++++++++++++++++ package.json | 1 + 3 files changed, 42 insertions(+) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index a08194bc..c1f85986 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -1,6 +1,11 @@ name: Docs on: + pull_request: + branches: + - main + - master + - stable* push: branches: - main @@ -39,6 +44,7 @@ jobs: npm run build:doc --if-present - name: Deploy + if: github.event_name != 'pull_request' uses: JamesIves/github-pages-deploy-action@v4 with: branch: gh-pages diff --git a/package-lock.json b/package-lock.json index d4217774..5e7a9081 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,6 +18,7 @@ "@babel/core": "^7.18.5", "@babel/preset-env": "^7.18.2", "@babel/preset-typescript": "^7.17.12", + "@nextcloud/typings": "^1.6.0", "@rollup-extras/plugin-clean": "^1.2.3", "@rollup/plugin-commonjs": "^24.0.1", "@rollup/plugin-node-resolve": "^15.0.1", @@ -2326,6 +2327,19 @@ "npm": "^7.0.0 || ^8.0.0" } }, + "node_modules/@nextcloud/typings": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@nextcloud/typings/-/typings-1.6.0.tgz", + "integrity": "sha512-5uIsteFy9Z9/ZaNGE8w8SDgJp+FK8/LeRLgfnakC2pU8eNKTPlQfkiYR163oEI5Xu5YzwdIzf6/roIXdNinhrw==", + "dev": true, + "dependencies": { + "@types/jquery": "2.0.60" + }, + "engines": { + "node": "^16.0.0", + "npm": "^7.0.0 || ^8.0.0" + } + }, "node_modules/@niceties/logger": { "version": "1.1.10", "resolved": "https://registry.npmjs.org/@niceties/logger/-/logger-1.1.10.tgz", @@ -2646,6 +2660,12 @@ "pretty-format": "^29.0.0" } }, + "node_modules/@types/jquery": { + "version": "2.0.60", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-2.0.60.tgz", + "integrity": "sha512-izi6OBEVrAwaHiqWITjOPBbVtcKZKAXTocJqPZsAKA2lvmbpFEyPSAxgcqmisbiMYj9EvrooUEPLHQeQqVMWAg==", + "dev": true + }, "node_modules/@types/jsdom": { "version": "20.0.0", "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-20.0.0.tgz", @@ -7957,6 +7977,15 @@ "core-js": "^3.6.4" } }, + "@nextcloud/typings": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@nextcloud/typings/-/typings-1.6.0.tgz", + "integrity": "sha512-5uIsteFy9Z9/ZaNGE8w8SDgJp+FK8/LeRLgfnakC2pU8eNKTPlQfkiYR163oEI5Xu5YzwdIzf6/roIXdNinhrw==", + "dev": true, + "requires": { + "@types/jquery": "2.0.60" + } + }, "@niceties/logger": { "version": "1.1.10", "resolved": "https://registry.npmjs.org/@niceties/logger/-/logger-1.1.10.tgz", @@ -8202,6 +8231,12 @@ "pretty-format": "^29.0.0" } }, + "@types/jquery": { + "version": "2.0.60", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-2.0.60.tgz", + "integrity": "sha512-izi6OBEVrAwaHiqWITjOPBbVtcKZKAXTocJqPZsAKA2lvmbpFEyPSAxgcqmisbiMYj9EvrooUEPLHQeQqVMWAg==", + "dev": true + }, "@types/jsdom": { "version": "20.0.0", "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-20.0.0.tgz", diff --git a/package.json b/package.json index 680e71a0..7d0a66be 100644 --- a/package.json +++ b/package.json @@ -50,6 +50,7 @@ "@babel/core": "^7.18.5", "@babel/preset-env": "^7.18.2", "@babel/preset-typescript": "^7.17.12", + "@nextcloud/typings": "^1.6.0", "@rollup-extras/plugin-clean": "^1.2.3", "@rollup/plugin-commonjs": "^24.0.1", "@rollup/plugin-node-resolve": "^15.0.1",