From ac6ae2e161d96a8b031a9930352db67cb35782e3 Mon Sep 17 00:00:00 2001 From: Lev Brouk Date: Wed, 17 Aug 2022 08:54:54 -0700 Subject: [PATCH] try 6 --- .circleci/config.yml | 22 +++++++++++----------- test/e2e/package-lock.json | 37 +++++++++++++++++++------------------ 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 24003aa9e..5fcc9f71c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -156,7 +156,7 @@ jobs: e2e-cypress-tests-pinned: resource_class: xlarge docker: - - image: cimg/go:1.18.3-node + - image: cimg/go:1.18.3-browsers environment: TEST_DATABASE_URL: postgres://mmuser:mostest@localhost:5432/mattermost_test MM_SERVICESETTINGS_ENABLEDEVELOPER: true @@ -263,7 +263,7 @@ jobs: e2e-cypress-tests-master: resource_class: xlarge docker: - - image: cimg/go:1.17.3-browsers + - image: cimg/go:1.18.3-browsers environment: TEST_DATABASE_URL: postgres://mmuser:mostest@localhost:5432/mattermost_test MM_SERVICESETTINGS_ENABLEDEVELOPER: true @@ -407,16 +407,16 @@ workflows: - lint - dist: requires: - - test + - lint - e2e-cypress-tests-pinned: requires: - - test + - lint - e2e-cypress-tests-master: requires: - - test + - lint - test-rest-postgres11: requires: - - test + - lint ci: jobs: @@ -432,13 +432,13 @@ workflows: only: /^v.*/ - dist: requires: - - test + - lint filters: tags: only: /^v.*/ - e2e-cypress-tests-pinned: requires: - - test + - lint filters: tags: only: /^v.*/ @@ -447,16 +447,16 @@ workflows: branches: only: master requires: - - test + - lint - test-rest-postgres11: requires: - - test + - lint filters: tags: only: /^v.*/ - coverage: requires: - - test + - lint filters: tags: only: /^v.*/ diff --git a/test/e2e/package-lock.json b/test/e2e/package-lock.json index 35870f0b5..5463205b4 100644 --- a/test/e2e/package-lock.json +++ b/test/e2e/package-lock.json @@ -4,6 +4,7 @@ "requires": true, "packages": { "": { + "name": "e2e", "dependencies": { "pdf-parse": "^1.1.1" }, @@ -6215,7 +6216,7 @@ "node_modules/fstream": { "version": "0.1.31", "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz", - "integrity": "sha1-czfwWPu7vvqMn1YaKMqwhJICyYg=", + "integrity": "sha512-N1pLGEHoDyCoI8uMmPXJXhn238L4nk41iipXCrqs4Ss0ooYSr5sNj2ucMo5AqJVC4OaOa7IztpBhOaaYTGZVuA==", "dev": true, "dependencies": { "graceful-fs": "~3.0.2", @@ -10176,9 +10177,9 @@ } }, "node_modules/moment": { - "version": "2.29.3", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.3.tgz", - "integrity": "sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw==", + "version": "2.29.4", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", + "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==", "dev": true, "engines": { "node": "*" @@ -14511,9 +14512,9 @@ } }, "node_modules/terser": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz", - "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==", + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.1.tgz", + "integrity": "sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==", "dev": true, "peer": true, "dependencies": { @@ -15135,7 +15136,7 @@ "node_modules/unzip": { "version": "0.1.11", "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.11.tgz", - "integrity": "sha1-iXScY7BY19kNYZ+GuYqhU107l/A=", + "integrity": "sha512-Dvxd7bj2RcfbM+AbNfx0Ufqvk7Kl4YGeAQlEGn9+glDQz1HFxeeRjBStxi/DfIvgutn6hbC4yMc1rEo3x+dmVQ==", "dev": true, "dependencies": { "binary": ">= 0.3.0 < 1", @@ -15529,7 +15530,7 @@ "node_modules/watchpack-chokidar2/node_modules/glob-parent": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==", "dev": true, "optional": true, "peer": true, @@ -21404,7 +21405,7 @@ "fstream": { "version": "0.1.31", "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz", - "integrity": "sha1-czfwWPu7vvqMn1YaKMqwhJICyYg=", + "integrity": "sha512-N1pLGEHoDyCoI8uMmPXJXhn238L4nk41iipXCrqs4Ss0ooYSr5sNj2ucMo5AqJVC4OaOa7IztpBhOaaYTGZVuA==", "dev": true, "requires": { "graceful-fs": "~3.0.2", @@ -24534,9 +24535,9 @@ } }, "moment": { - "version": "2.29.3", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.3.tgz", - "integrity": "sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw==", + "version": "2.29.4", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", + "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==", "dev": true }, "moment-timezone": { @@ -28066,9 +28067,9 @@ } }, "terser": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz", - "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==", + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.1.tgz", + "integrity": "sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==", "dev": true, "peer": true, "requires": { @@ -28568,7 +28569,7 @@ "unzip": { "version": "0.1.11", "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.11.tgz", - "integrity": "sha1-iXScY7BY19kNYZ+GuYqhU107l/A=", + "integrity": "sha512-Dvxd7bj2RcfbM+AbNfx0Ufqvk7Kl4YGeAQlEGn9+glDQz1HFxeeRjBStxi/DfIvgutn6hbC4yMc1rEo3x+dmVQ==", "dev": true, "requires": { "binary": ">= 0.3.0 < 1", @@ -28924,7 +28925,7 @@ "glob-parent": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==", "dev": true, "optional": true, "peer": true,