Skip to content

Commit 6446892

Browse files
authored
Merge pull request #859 from unexpectedjs/ssimonsen/ci-on-ubuntu-latest
Run CI on Ubuntu latest
2 parents a47e211 + 2b531ea commit 6446892

File tree

7 files changed

+9
-38
lines changed

7 files changed

+9
-38
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ name: Tests
33
push:
44
pull_request:
55

6-
env:
7-
BROWSER_STACK_ACCESS_KEY: '${{ secrets.BROWSER_STACK_ACCESS_KEY }}'
8-
BROWSER_STACK_USERNAME: '${{ secrets.BROWSER_STACK_USERNAME }}'
9-
106
jobs:
117
test:
12-
runs-on: ubuntu-20.04
8+
runs-on: ubuntu-latest
139
name: Node ${{ matrix.node }}
1410
strategy:
1511
matrix:
1612
node:
1713
- '14'
1814
- '16'
15+
- '18'
16+
- '20'
17+
- '22'
18+
- '24'
1919
steps:
2020
- uses: actions/checkout@v2
2121
- name: Setup node
@@ -26,7 +26,7 @@ jobs:
2626
- run: make test
2727

2828
test-targets:
29-
runs-on: ubuntu-20.04
29+
runs-on: ubuntu-latest
3030
name: ${{ matrix.targets.name }}
3131
strategy:
3232
matrix:
@@ -41,16 +41,14 @@ jobs:
4141
name: 'Jasmine'
4242
- target: 'test-plugins'
4343
name: 'Plugins'
44-
- target: 'test-browserstack-ie11'
45-
name: 'Browser - IE11'
4644
- target: 'test-deno'
4745
name: 'Deno'
4846
steps:
4947
- uses: actions/checkout@v2
5048
- name: Setup node
5149
uses: actions/setup-node@v1
5250
with:
53-
node-version: '14'
51+
node-version: '18.18.2'
5452
- run: npm install
5553
- run: make ${{ matrix.targets.target }}
5654
- name: Upload coverage

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v14.21.3
1+
v18.18.2

Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,6 @@ test-browser: ${TARGETS}
7171
test-chrome-headless: ${TARGETS}
7272
@./node_modules/.bin/karma start --browsers=ChromeHeadlessNoSandbox --single-run
7373

74-
.PHONY: test-browserstack
75-
test-browserstack-%: ${TARGETS}
76-
@./node_modules/.bin/karma start --browsers=$* --single-run
77-
7874
.PHONY: test-plugins
7975
test-plugins: ${TARGETS}
8076
./node_modules/.bin/fugl --config .fugl.json --reporter html --ci

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@ Extensible BDD assertion toolkit
77
[![Coverage Status](https://coveralls.io/repos/unexpectedjs/unexpected/badge.svg)](https://coveralls.io/r/unexpectedjs/unexpected)
88
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/unexpectedjs/unexpected?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
99
[![Github](https://img.shields.io/github/stars/unexpectedjs/unexpected.svg?label=Star&maxAge=2592000&style=flat)](https://github.com/unexpectedjs/unexpected)
10-
[![BrowserStack Status](https://www.browserstack.com/automate/badge.svg?badge_key=cjVWSDFIaERKWVdxc2s5bStaY08vMUFwbW1NbTdzZHJmVXBCUjBlemo3Yz0tLU5iL3I0L3Z4elVhZjBTbWtvbmpHRnc9PQ==--692805fea09bec4c4ea7c898fa9208a0fa61283e)](https://www.browserstack.com/automate/public-build/cjVWSDFIaERKWVdxc2s5bStaY08vMUFwbW1NbTdzZHJmVXBCUjBlemo3Yz0tLU5iL3I0L3Z4elVhZjBTbWtvbmpHRnc9PQ==--692805fea09bec4c4ea7c898fa9208a0fa61283e)
11-
1210
Read [the documentation](https://unexpected.js.org/).

documentation/index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ to satisfy { name: 'Unexpected', created: 2013 }
4343
[![Coverage Status](https://coveralls.io/repos/unexpectedjs/unexpected/badge.svg)](https://coveralls.io/github/unexpectedjs/unexpected)
4444
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/unexpectedjs/unexpected?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
4545
[![Github](https://img.shields.io/github/stars/unexpectedjs/unexpected.svg?label=Star&maxAge=2592000&style=flat)](https://github.com/unexpectedjs/unexpected)
46-
[![BrowserStack Status](https://www.browserstack.com/automate/badge.svg?badge_key=cjVWSDFIaERKWVdxc2s5bStaY08vMUFwbW1NbTdzZHJmVXBCUjBlemo3Yz0tLU5iL3I0L3Z4elVhZjBTbWtvbmpHRnc9PQ==--692805fea09bec4c4ea7c898fa9208a0fa61283e)](https://www.browserstack.com/automate/public-build/cjVWSDFIaERKWVdxc2s5bStaY08vMUFwbW1NbTdzZHJmVXBCUjBlemo3Yz0tLU5iL3I0L3Z4elVhZjBTbWtvbmpHRnc9PQ==--692805fea09bec4c4ea7c898fa9208a0fa61283e)
4746

4847
## Features
4948

karma.conf.js

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,13 @@ module.exports = function (config) {
2525
},
2626
},
2727

28-
browserStack: {
29-
video: false,
30-
project:
31-
process.env.GITHUB_REF === 'refs/heads/master' &&
32-
!process.env.GITHUB_HEAD_REF // Catch "PR" builds
33-
? 'unexpected'
34-
: 'unexpected-dev',
35-
// Attempt to fix timeouts on CI:
36-
// https://github.com/karma-runner/karma-browserstack-launcher/pull/168#issuecomment-582373514
37-
timeout: 1800,
38-
},
39-
4028
customLaunchers: {
4129
ChromeHeadlessNoSandbox: {
4230
base: 'ChromeHeadless',
4331
flags: ['--no-sandbox'],
4432
},
45-
ie11: {
46-
base: 'BrowserStack',
47-
browser: 'IE',
48-
browser_version: '11',
49-
os: 'Windows',
50-
os_version: '7',
51-
},
5233
},
5334

54-
reporters: ['dots', 'BrowserStack'],
35+
reporters: ['dots'],
5536
});
5637
};

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
"jasmine-core": "^4.0.0",
5353
"jest": "^26.6.3",
5454
"karma": "^6.3.16",
55-
"karma-browserstack-launcher": "1.6.0",
5655
"karma-chrome-launcher": "3.1.0",
5756
"karma-mocha": "2.0.1",
5857
"minimist": "^1.2.0",

0 commit comments

Comments
 (0)