Skip to content

Commit 3c44d1b

Browse files
committed
fixup! use npm cache from setup-node; move ie test to windows-latest
1 parent 69a35ff commit 3c44d1b

File tree

5 files changed

+48
-41
lines changed

5 files changed

+48
-41
lines changed

.github/workflows/jquery-migrate.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,15 @@ jobs:
2323
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
2424
with:
2525
node-version: ${{ env.NODE_VERSION }}
26-
27-
- name: Cache
28-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
29-
with:
30-
path: ~/.npm
31-
key: ${{ runner.os }}-node-${{ env.NODE_VERSION }}-npm-lock-${{ hashFiles('**/package-lock.json') }}
32-
restore-keys: |
33-
${{ runner.os }}-node-${{ env.NODE_VERSION }}-npm-lock-
26+
cache: npm
27+
cache-dependency-path: '**/package-lock.json'
3428

3529
- name: Install dependencies
36-
run: npm install
30+
run: npm ci
3731

3832
- name: Install jQuery Migrate dependencies
3933
working-directory: test/jquery-migrate
40-
run: npm install
34+
run: npm ci
4135

4236
- name: Install local JTR
4337
working-directory: test/jquery-migrate

.github/workflows/jquery-mousewheel.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,15 @@ jobs:
2323
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
2424
with:
2525
node-version: ${{ env.NODE_VERSION }}
26-
27-
- name: Cache
28-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
29-
with:
30-
path: ~/.npm
31-
key: ${{ runner.os }}-node-${{ env.NODE_VERSION }}-npm-lock-${{ hashFiles('**/package-lock.json') }}
32-
restore-keys: |
33-
${{ runner.os }}-node-${{ env.NODE_VERSION }}-npm-lock-
26+
cache: npm
27+
cache-dependency-path: '**/package-lock.json'
3428

3529
- name: Install dependencies
36-
run: npm install
30+
run: npm ci
3731

3832
- name: Install jQuery Mousewheel dependencies
3933
working-directory: test/jquery-mousewheel
40-
run: npm install
34+
run: npm ci
4135

4236
- name: Install local JTR
4337
working-directory: test/jquery-mousewheel

.github/workflows/jquery-ui.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,15 @@ jobs:
2323
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
2424
with:
2525
node-version: ${{ env.NODE_VERSION }}
26-
27-
- name: Cache
28-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
29-
with:
30-
path: ~/.npm
31-
key: ${{ runner.os }}-node-${{ env.NODE_VERSION }}-npm-lock-${{ hashFiles('**/package-lock.json') }}
32-
restore-keys: |
33-
${{ runner.os }}-node-${{ env.NODE_VERSION }}-npm-lock-
26+
cache: npm
27+
cache-dependency-path: '**/package-lock.json'
3428

3529
- name: Install dependencies
36-
run: npm install
30+
run: npm ci
3731

3832
- name: Install jQuery UI dependencies
3933
working-directory: test/jquery-ui
40-
run: npm install
34+
run: npm ci
4135

4236
- name: Install local JTR
4337
working-directory: test/jquery-ui

.github/workflows/jquery.yml

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,15 @@ jobs:
2323
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
2424
with:
2525
node-version: ${{ env.NODE_VERSION }}
26-
27-
- name: Cache
28-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
29-
with:
30-
path: ~/.npm
31-
key: ${{ runner.os }}-node-${{ env.NODE_VERSION }}-npm-lock-${{ hashFiles('**/package-lock.json') }}
32-
restore-keys: |
33-
${{ runner.os }}-node-${{ env.NODE_VERSION }}-npm-lock-
26+
cache: npm
27+
cache-dependency-path: '**/package-lock.json'
3428

3529
- name: Install dependencies
36-
run: npm install
30+
run: npm ci
3731

3832
- name: Install jQuery dependencies
3933
working-directory: test/jquery
40-
run: npm install
34+
run: npm ci
4135

4236
- name: Install local JTR
4337
working-directory: test/jquery
@@ -50,3 +44,30 @@ jobs:
5044
- name: Run jQuery tests in Edge in IE mode
5145
working-directory: test/jquery
5246
run: npm run test:ie -- -v
47+
48+
ie:
49+
runs-on: windows-latest
50+
name: Test jQuery with IEDriver
51+
steps:
52+
- name: Checkout
53+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
54+
with:
55+
submodules: recursive
56+
57+
- name: Use Node.js ${{ env.NODE_VERSION }}
58+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
59+
with:
60+
node-version: ${{ env.NODE_VERSION }}
61+
cache: npm
62+
cache-dependency-path: '**/package-lock.json'
63+
64+
- name: Install dependencies
65+
run: npm ci
66+
67+
- name: Install local JTR
68+
working-directory: test/jquery
69+
run: npm install -D ../../
70+
71+
- name: Run jQuery tests in Edge in IE mode
72+
working-directory: test/jquery
73+
run: npm run test:ie -- -v

run.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,13 @@ export async function run( {
195195
}
196196

197197
asyncExitHook(
198-
async() => {
198+
async( signal ) => {
199199
await cleanup();
200200
await stopServer();
201+
202+
if ( verbose ) {
203+
console.log( `Exited with signal: ${ signal }` );
204+
}
201205
},
202206
{ wait: EXIT_HOOK_WAIT_TIMEOUT }
203207
);

0 commit comments

Comments
 (0)