From 58f869b21bea1dffc2ff9baf27c0e841a17b8d70 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Jun 2023 23:47:38 +0000 Subject: [PATCH 1/4] chore(deps-dev): bump webpack from 5.86.0 to 5.88.0 (#6764) Bumps [webpack](https://github.com/webpack/webpack) from 5.86.0 to 5.88.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v5.86.0...v5.88.0) --- updated-dependencies: - dependency-name: webpack dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bc13c42066..bc2c260005 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "vue-eslint-parser": "9.3.1", "vue-loader": "15.9.8", "vue-template-compiler": "2.6.14", - "webpack": "5.86.0", + "webpack": "5.88.0", "webpack-cli": "5.1.1", "webpack-dev-server": "4.15.1", "webpack-merge": "5.9.0" From ff7f55574d69c548dcc1dd0958b39a5925e8fced Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Jun 2023 08:12:02 +0000 Subject: [PATCH 2/4] chore(deps-dev): bump flatbush from 4.1.0 to 4.2.0 (#6762) Bumps [flatbush](https://github.com/mourner/flatbush) from 4.1.0 to 4.2.0. - [Release notes](https://github.com/mourner/flatbush/releases) - [Commits](https://github.com/mourner/flatbush/compare/v4.1.0...v4.2.0) --- updated-dependencies: - dependency-name: flatbush dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bc2c260005..5cfec6db86 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "eslint-plugin-you-dont-need-lodash-underscore": "6.12.0", "eventemitter3": "1.2.0", "file-saver": "2.0.5", - "flatbush": "4.1.0", + "flatbush": "4.2.0", "git-rev-sync": "3.0.2", "html2canvas": "1.4.1", "imports-loader": "4.0.1", From 3b0e05ed14d0f187a9fa2f85e9099888f35ec81d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Jun 2023 11:39:24 -0700 Subject: [PATCH 3/4] chore(deps-dev): bump sanitize-html from 2.10.0 to 2.11.0 (#6766) Bumps [sanitize-html](https://github.com/apostrophecms/sanitize-html) from 2.10.0 to 2.11.0. - [Changelog](https://github.com/apostrophecms/sanitize-html/blob/main/CHANGELOG.md) - [Commits](https://github.com/apostrophecms/sanitize-html/compare/2.10.0...2.11.0) --- updated-dependencies: - dependency-name: sanitize-html dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5cfec6db86..e0a06d6f43 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "prettier": "2.8.7", "printj": "1.3.1", "resolve-url-loader": "5.0.0", - "sanitize-html": "2.10.0", + "sanitize-html": "2.11.0", "sass": "1.63.4", "sass-loader": "13.3.2", "sinon": "15.1.0", From 9c22bcfb3e10b1966de9acd22efc4d20f2ee7da4 Mon Sep 17 00:00:00 2001 From: John Hill Date: Sat, 8 Jul 2023 13:03:14 -0700 Subject: [PATCH 4/4] [CI] Fix couchdb e2e trigger and run nightly, part 3 (#6782) * Run nightly, fix triggers * contains * driveby: remove github reporter * update tests to match * redo opened logic * don't run pr:e2e and pr:platform --- .github/workflows/e2e-couchdb.yml | 6 +++++- .github/workflows/e2e-pr.yml | 6 +++++- .github/workflows/pr-platform.yml | 7 +++++-- e2e/playwright-ci.config.js | 1 - 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/e2e-couchdb.yml b/.github/workflows/e2e-couchdb.yml index cada516eb8..264cae4528 100644 --- a/.github/workflows/e2e-couchdb.yml +++ b/.github/workflows/e2e-couchdb.yml @@ -1,13 +1,17 @@ name: 'e2e-couchdb' on: + push: + branches: master workflow_dispatch: pull_request: types: - labeled - opened + schedule: + - cron: '0 0 * * *' jobs: e2e-couchdb: - if: github.event.label.name == 'pr:e2e:couchdb' || github.event.action == 'opened' && github.actor == 'dependabot[bot]' + if: contains(github.event.pull_request.labels.*.name, 'pr:e2e:couchdb') || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || github.event.action == 'opened' runs-on: ubuntu-latest timeout-minutes: 60 steps: diff --git a/.github/workflows/e2e-pr.yml b/.github/workflows/e2e-pr.yml index 0e4a8d9a9d..9e2ea8f711 100644 --- a/.github/workflows/e2e-pr.yml +++ b/.github/workflows/e2e-pr.yml @@ -1,13 +1,17 @@ name: 'e2e-pr' on: + push: + branches: master workflow_dispatch: pull_request: types: - labeled - opened + schedule: + - cron: '0 0 * * *' jobs: e2e-full: - if: github.event.label.name == 'pr:e2e' || github.event.action == 'opened' && github.actor == 'dependabot[bot]' + if: contains(github.event.pull_request.labels.*.name, 'pr:e2e') || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' runs-on: ${{ matrix.os }} timeout-minutes: 60 strategy: diff --git a/.github/workflows/pr-platform.yml b/.github/workflows/pr-platform.yml index 1f1cdfbaa1..e6be244bd1 100644 --- a/.github/workflows/pr-platform.yml +++ b/.github/workflows/pr-platform.yml @@ -1,14 +1,17 @@ name: 'pr-platform' on: + push: + branches: master workflow_dispatch: pull_request: types: - labeled - opened - + schedule: + - cron: '0 0 * * *' jobs: pr-platform: - if: github.event.label.name == 'pr:platform' || github.event.action == 'opened' && github.actor == 'dependabot[bot]' + if: contains(github.event.pull_request.labels.*.name, 'pr:platform') || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' runs-on: ${{ matrix.os }} timeout-minutes: 60 strategy: diff --git a/e2e/playwright-ci.config.js b/e2e/playwright-ci.config.js index 5335bde352..266ac4a3ab 100644 --- a/e2e/playwright-ci.config.js +++ b/e2e/playwright-ci.config.js @@ -77,7 +77,6 @@ const config = { } ], ['junit', { outputFile: '../test-results/results.xml' }], - ['github'], ['@deploysentinel/playwright'] ] };