From b3b49d4736453cd61a37e8f03bf95a6bb858cd29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sascha=20I=C3=9Fbr=C3=BCcker?= Date: Thu, 7 Nov 2024 14:55:08 +0100 Subject: [PATCH] chore: update sauce connect launcher --- .github/workflows/unit-tests.yml | 20 ++++++------------- ...al-tests.yml => visual-tests.yml.disabled} | 0 package-lock-p3.json | 12 +++++------ package-lock.json | 12 +++++------ package.json | 5 +++++ wct.conf.js | 16 --------------- 6 files changed, 21 insertions(+), 44 deletions(-) rename .github/workflows/{visual-tests.yml => visual-tests.yml.disabled} (100%) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 83ca2a5..b8c516c 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -8,18 +8,14 @@ jobs: name: Polymer 2 on the CI agent runs-on: ubuntu-latest steps: - - name: Set up Node 12.x - uses: actions/setup-node@v2 + - name: Set up Node 16.x + uses: actions/setup-node@v4 with: - node-version: 12.x + node-version: 16.x - name: Check out the source code uses: actions/checkout@v2 - - name: Install latest npm - # magi-cli 1.0 requires npm 7 or higher - run: "npm install -g npm@8" - - name: Install global npm dependencies # bower is needed to run 'bower install' # polymer-cli is needed to run the lint step @@ -45,18 +41,14 @@ jobs: name: Polymer 3 on SauceLabs runs-on: ubuntu-latest steps: - - name: Set up Node 12.x - uses: actions/setup-node@v2 + - name: Set up Node 16.x + uses: actions/setup-node@v4 with: - node-version: 12.x + node-version: 16.x - name: Check out the (Polymer 2) source code uses: actions/checkout@v2 - - name: Install latest npm - # magi-cli 1.0 requires npm 7 or higher - run: "npm install -g npm@8" - - name: Install global npm dependencies # bower and polymer-modulizer are needed to run the Polymer 3 conversion step run: "npm install --quiet --no-progress --global bower magi-cli polymer-modulizer" diff --git a/.github/workflows/visual-tests.yml b/.github/workflows/visual-tests.yml.disabled similarity index 100% rename from .github/workflows/visual-tests.yml rename to .github/workflows/visual-tests.yml.disabled diff --git a/package-lock-p3.json b/package-lock-p3.json index 011ce82..5515e45 100644 --- a/package-lock-p3.json +++ b/package-lock-p3.json @@ -10039,8 +10039,7 @@ }, "node_modules/sauce-connect-launcher": { "version": "1.3.2", - "resolved": "https://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-1.3.2.tgz", - "integrity": "sha512-wf0coUlidJ7rmeClgVVBh6Kw55/yalZCY/Un5RgjSnTXRAeGqagnTsTYpZaqC4dCtrY4myuYpOAZXCdbO7lHfQ==", + "resolved": "git+ssh://git@github.com/vaadin/sauce-connect-launcher.git#75b065db538ce6ec733e460bd697743df70c632b", "dev": true, "hasInstallScript": true, "optional": true, @@ -21588,9 +21587,7 @@ "dev": true }, "sauce-connect-launcher": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-1.3.2.tgz", - "integrity": "sha512-wf0coUlidJ7rmeClgVVBh6Kw55/yalZCY/Un5RgjSnTXRAeGqagnTsTYpZaqC4dCtrY4myuYpOAZXCdbO7lHfQ==", + "version": "git+ssh://git@github.com/vaadin/sauce-connect-launcher.git#75b065db538ce6ec733e460bd697743df70c632b", "dev": true, "optional": true, "requires": { @@ -21649,7 +21646,8 @@ "glob": "^7.1.3" } } - } + }, + "from": "sauce-connect-launcher@vaadin/sauce-connect-launcher#upgrade-sauce-connect-5" }, "select-hose": { "version": "2.0.0", @@ -23697,7 +23695,7 @@ "cleankill": "^2.0.0", "lodash": "^4.17.10", "request": "^2.85.0", - "sauce-connect-launcher": "^1.0.0", + "sauce-connect-launcher": "vaadin/sauce-connect-launcher#upgrade-sauce-connect-5", "temp": "^0.8.1", "uuid": "^3.2.1" }, diff --git a/package-lock.json b/package-lock.json index e154276..296c487 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12115,8 +12115,7 @@ }, "node_modules/sauce-connect-launcher": { "version": "1.3.2", - "resolved": "https://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-1.3.2.tgz", - "integrity": "sha512-wf0coUlidJ7rmeClgVVBh6Kw55/yalZCY/Un5RgjSnTXRAeGqagnTsTYpZaqC4dCtrY4myuYpOAZXCdbO7lHfQ==", + "resolved": "git+ssh://git@github.com/vaadin/sauce-connect-launcher.git#75b065db538ce6ec733e460bd697743df70c632b", "dev": true, "hasInstallScript": true, "optional": true, @@ -27255,9 +27254,7 @@ "dev": true }, "sauce-connect-launcher": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-1.3.2.tgz", - "integrity": "sha512-wf0coUlidJ7rmeClgVVBh6Kw55/yalZCY/Un5RgjSnTXRAeGqagnTsTYpZaqC4dCtrY4myuYpOAZXCdbO7lHfQ==", + "version": "git+ssh://git@github.com/vaadin/sauce-connect-launcher.git#75b065db538ce6ec733e460bd697743df70c632b", "dev": true, "optional": true, "requires": { @@ -27289,7 +27286,8 @@ "debug": "4" } } - } + }, + "from": "sauce-connect-launcher@vaadin/sauce-connect-launcher#upgrade-sauce-connect-5" }, "select-hose": { "version": "2.0.0", @@ -30703,7 +30701,7 @@ "cleankill": "^2.0.0", "lodash": "^4.17.10", "request": "^2.85.0", - "sauce-connect-launcher": "^1.0.0", + "sauce-connect-launcher": "vaadin/sauce-connect-launcher#upgrade-sauce-connect-5", "temp": "^0.8.1", "uuid": "^3.2.1" } diff --git a/package.json b/package.json index dd13f2d..3228c0d 100644 --- a/package.json +++ b/package.json @@ -44,5 +44,10 @@ }, "devDependencies": { "@vaadin/vaadin-component-dev-dependencies": "^3.2.0" + }, + "overrides": { + "wct-sauce": { + "sauce-connect-launcher": "vaadin/sauce-connect-launcher#upgrade-sauce-connect-5" + } } } diff --git a/wct.conf.js b/wct.conf.js index 2bcbc9b..4960ecd 100644 --- a/wct.conf.js +++ b/wct.conf.js @@ -19,21 +19,6 @@ module.exports = { ] } }, - // MAGI REMOVE START - istanbul: { - dir: './coverage', - reporters: ['text-summary', 'lcov'], - include: [ - '**/vaadin-accordion/src/*.html' - ], - exclude: [], - thresholds: { - global: { - statements: 98 - } - } - } - // MAGI REMOVE END }, registerHooks: function(context) { @@ -47,7 +32,6 @@ module.exports = { 'iOS Simulator/iphone@10.3', // should be 9.x, but SauceLabs does not provide that 'macOS 11/safari@latest', 'Windows 10/microsoftedge@latest', - 'Windows 10/microsoftedge@18', 'Windows 10/internet explorer@11', 'Windows 10/chrome@latest', 'Windows 10/firefox@latest',