Skip to content

Commit 53520cb

Browse files
committed
.
1 parent b733613 commit 53520cb

File tree

3 files changed

+28
-24
lines changed

3 files changed

+28
-24
lines changed

.github/workflows/browser-test.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ jobs:
1212
runs-on: ubuntu-latest
1313
if: contains(github.event.pull_request.labels.*.name, 'run-browser-test')
1414
steps:
15-
- uses: actions/setup-node@v3
15+
- uses: actions/setup-node@v4
1616
with:
1717
node-version: lts/*
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
with:
2020
ref: ${{ github.event.pull_request.head.sha }}
21+
persist-credentials: false
2122
- name: 'Cache node_modules'
2223
uses: actions/cache@v3
2324
with:

.github/workflows/mocha.yml

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ jobs:
2222
- name: Check event pull_request
2323
if: github.event_name == 'pull_request'
2424
run: 'echo pull_request: run workflow'
25-
- uses: actions/checkout@v3
25+
- uses: actions/checkout@v4
2626
if: github.event_name == 'push'
27+
with:
28+
persist-credentials: false
2729
- name: Check event push
2830
id: findPr
2931
if: github.event_name == 'push'
@@ -46,10 +48,11 @@ jobs:
4648
- 16
4749
- 18
4850
- 20
49-
- 21
5051
steps:
51-
- uses: actions/checkout@v3
52-
- uses: actions/setup-node@v3
52+
- uses: actions/checkout@v4
53+
with:
54+
persist-credentials: false
55+
- uses: actions/setup-node@v4
5356
with:
5457
node-version: '${{ matrix.node }}'
5558
- run: npm install --production
@@ -60,10 +63,12 @@ jobs:
6063
runs-on: ubuntu-latest
6164
needs: smoke
6265
steps:
63-
- uses: actions/setup-node@v3
66+
- uses: actions/setup-node@v4
6467
with:
6568
node-version: lts/*
66-
- uses: actions/checkout@v3
69+
- uses: actions/checkout@v4
70+
with:
71+
persist-credentials: false
6772
- name: 'Cache node_modules'
6873
uses: actions/cache@v3
6974
with:
@@ -90,17 +95,18 @@ jobs:
9095
- 16
9196
- 18
9297
- 20
93-
- 21
9498
include:
9599
- os: ubuntu-latest
96100
node: 16
97101
env:
98102
COVERAGE: 1
99103
steps:
100-
- uses: actions/setup-node@v3
104+
- uses: actions/setup-node@v4
101105
with:
102106
node-version: '${{ matrix.node }}'
103-
- uses: actions/checkout@v3
107+
- uses: actions/checkout@v4
108+
with:
109+
persist-credentials: false
104110
- name: Get npm cache directory in Windows
105111
id: npm-cache
106112
if: ${{ matrix.os == 'windows-2019' }}
@@ -111,8 +117,6 @@ jobs:
111117
with:
112118
path: ${{ matrix.os == 'ubuntu-latest' && '~/.npm' || steps.npm-cache.outputs.dir }}
113119
key: "${{ matrix.os }}-node-v${{ matrix.node }}-${{ hashFiles('**/package-lock.json') }}"
114-
restore-keys: |
115-
${{ matrix.os }}-node-v${{ matrix.node }}-
116120
- name: Install Dependencies
117121
run: npm ci --ignore-scripts
118122
- name: Install Annotation Support
@@ -141,19 +145,19 @@ jobs:
141145
# Don't run forked 'pull_request' without saucelabs token
142146
if: github.event_name == 'push' || !github.event.pull_request.head.repo.fork
143147
steps:
144-
- uses: actions/setup-node@v3
148+
- uses: actions/setup-node@v4
145149
with:
146150
node-version: lts/*
147-
- uses: actions/checkout@v3
151+
- uses: actions/checkout@v4
152+
with:
153+
persist-credentials: false
148154
- name: 'Cache node_modules'
149155
uses: actions/cache@v3
150156
with:
151157
path: '~/.npm'
152158
# this key is different than above, since we are running scripts
153159
# (builds, postinstall lifecycle hooks, etc.)
154-
key: "ubuntu-latest-node-full-v16-${{ hashFiles('**/package-lock.json') }}"
155-
restore-keys: |
156-
ubuntu-latest-node-full-v16-
160+
key: "ubuntu-latest-node-full-lts-${{ hashFiles('**/package-lock.json') }}"
157161
- name: Install Dependencies
158162
run: npm ci
159163
- name: Run Browser Tests

karma.conf.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,6 @@ const baseConfig = {
6767
showDiff: true
6868
},
6969
customLaunchers: {
70-
FirefoxDebug: {
71-
base: "Firefox",
72-
"moz:debuggerAddress": true
73-
},
7470
ChromeDebug: {
7571
base: 'Chrome',
7672
flags: ['--remote-debugging-port=9333']
@@ -95,7 +91,6 @@ module.exports = config => {
9591
bundleDirPath = path.join(BASE_BUNDLE_DIR_PATH, buildId);
9692
sauceConfig = {
9793
build: buildId,
98-
geckodriverVersion: '0.30.0' // temporary workaround for firefox
9994
};
10095
} else {
10196
console.error(`Local environment (${hostname}) detected`);
@@ -176,7 +171,7 @@ const addSauceTests = (cfg, sauceLabs) => {
176171
const customLaunchers = sauceBrowsers.reduce((acc, sauceBrowser) => {
177172
const platformName = SAUCE_BROWSER_PLATFORM_MAP[sauceBrowser];
178173
const [browserName, browserVersion] = sauceBrowser.split('@');
179-
return {
174+
const result = {
180175
...acc,
181176
[sauceBrowser]: {
182177
base: 'SauceLabs',
@@ -186,6 +181,10 @@ const addSauceTests = (cfg, sauceLabs) => {
186181
'sauce:options': sauceLabs
187182
}
188183
};
184+
if (browserName === 'firefox') {
185+
result[sauceBrowser]['moz:debuggerAddress'] = true;
186+
}
187+
return result;
189188
}, {});
190189

191190
return {

0 commit comments

Comments
 (0)