mirror of
https://github.com/Leaflet/Leaflet.git
synced 2025-08-05 18:55:04 +00:00
Add Windows and MacOS to the testing matrix (#8540)
This commit is contained in:

committed by
GitHub

parent
3cb07e4577
commit
bf20569dce
19
.github/workflows/main.yml
vendored
19
.github/workflows/main.yml
vendored
@ -6,7 +6,10 @@ env:
|
|||||||
NODE_VERSION: 16
|
NODE_VERSION: 16
|
||||||
jobs:
|
jobs:
|
||||||
setup:
|
setup:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ${{ matrix.os }}
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
os: [ubuntu-latest, windows-2019, macos-latest]
|
||||||
steps:
|
steps:
|
||||||
- name: Check out repository
|
- name: Check out repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
@ -29,7 +32,10 @@ jobs:
|
|||||||
|
|
||||||
build:
|
build:
|
||||||
needs: setup
|
needs: setup
|
||||||
runs-on: ubuntu-latest
|
runs-on: ${{ matrix.os }}
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
os: [ubuntu-latest, windows-2019, macos-latest]
|
||||||
steps:
|
steps:
|
||||||
- name: Restore setup
|
- name: Restore setup
|
||||||
uses: actions/cache@v3
|
uses: actions/cache@v3
|
||||||
@ -137,7 +143,7 @@ jobs:
|
|||||||
|
|
||||||
test:
|
test:
|
||||||
needs: build
|
needs: build
|
||||||
runs-on: ubuntu-latest
|
runs-on: ${{ matrix.os || 'ubuntu-latest' }}
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
@ -145,6 +151,13 @@ jobs:
|
|||||||
- browser: Chrome1280x1024
|
- browser: Chrome1280x1024
|
||||||
- browser: FirefoxTouch
|
- browser: FirefoxTouch
|
||||||
- browser: FirefoxNoTouch
|
- browser: FirefoxNoTouch
|
||||||
|
- browser: FirefoxRetina
|
||||||
|
- browser: Chrome1280x1024
|
||||||
|
os: windows-2019
|
||||||
|
- browser: Chrome1280x1024
|
||||||
|
os: macos-latest
|
||||||
|
- browser: SafariNative
|
||||||
|
os: macos-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Restore build
|
- name: Restore build
|
||||||
uses: actions/cache@v3
|
uses: actions/cache@v3
|
||||||
|
18
package-lock.json
generated
18
package-lock.json
generated
@ -24,7 +24,7 @@
|
|||||||
"karma-firefox-launcher": "^2.1.2",
|
"karma-firefox-launcher": "^2.1.2",
|
||||||
"karma-mocha": "^2.0.1",
|
"karma-mocha": "^2.0.1",
|
||||||
"karma-rollup-preprocessor": "^7.0.8",
|
"karma-rollup-preprocessor": "^7.0.8",
|
||||||
"karma-safari-launcher": "~1.0.0",
|
"karma-safarinative-launcher": "^1.1.0",
|
||||||
"karma-sinon": "^1.0.5",
|
"karma-sinon": "^1.0.5",
|
||||||
"karma-time-stats-reporter": "^0.1.0",
|
"karma-time-stats-reporter": "^0.1.0",
|
||||||
"leafdoc": "^2.3.0",
|
"leafdoc": "^2.3.0",
|
||||||
@ -2491,10 +2491,10 @@
|
|||||||
"rollup": ">= 1.0.0"
|
"rollup": ">= 1.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/karma-safari-launcher": {
|
"node_modules/karma-safarinative-launcher": {
|
||||||
"version": "1.0.0",
|
"version": "1.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/karma-safari-launcher/-/karma-safari-launcher-1.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/karma-safarinative-launcher/-/karma-safarinative-launcher-1.1.0.tgz",
|
||||||
"integrity": "sha512-qmypLWd6F2qrDJfAETvXDfxHvKDk+nyIjpH9xIeI3/hENr0U3nuqkxaftq73PfXZ4aOuOChA6SnLW4m4AxfRjQ==",
|
"integrity": "sha512-vdMjdQDHkSUbOZc8Zq2K5bBC0yJGFEgfrKRJTqt0Um0SC1Rt8drS2wcN6UA3h4LgsL3f1pMcmRSvKucbJE8Qdg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"karma": ">=0.9"
|
"karma": ">=0.9"
|
||||||
@ -6604,10 +6604,10 @@
|
|||||||
"debounce": "^1.2.0"
|
"debounce": "^1.2.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"karma-safari-launcher": {
|
"karma-safarinative-launcher": {
|
||||||
"version": "1.0.0",
|
"version": "1.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/karma-safari-launcher/-/karma-safari-launcher-1.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/karma-safarinative-launcher/-/karma-safarinative-launcher-1.1.0.tgz",
|
||||||
"integrity": "sha512-qmypLWd6F2qrDJfAETvXDfxHvKDk+nyIjpH9xIeI3/hENr0U3nuqkxaftq73PfXZ4aOuOChA6SnLW4m4AxfRjQ==",
|
"integrity": "sha512-vdMjdQDHkSUbOZc8Zq2K5bBC0yJGFEgfrKRJTqt0Um0SC1Rt8drS2wcN6UA3h4LgsL3f1pMcmRSvKucbJE8Qdg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {}
|
"requires": {}
|
||||||
},
|
},
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
"karma-firefox-launcher": "^2.1.2",
|
"karma-firefox-launcher": "^2.1.2",
|
||||||
"karma-mocha": "^2.0.1",
|
"karma-mocha": "^2.0.1",
|
||||||
"karma-rollup-preprocessor": "^7.0.8",
|
"karma-rollup-preprocessor": "^7.0.8",
|
||||||
"karma-safari-launcher": "~1.0.0",
|
"karma-safarinative-launcher": "^1.1.0",
|
||||||
"karma-sinon": "^1.0.5",
|
"karma-sinon": "^1.0.5",
|
||||||
"karma-time-stats-reporter": "^0.1.0",
|
"karma-time-stats-reporter": "^0.1.0",
|
||||||
"leafdoc": "^2.3.0",
|
"leafdoc": "^2.3.0",
|
||||||
|
@ -32,7 +32,7 @@ module.exports = function (config) {
|
|||||||
'karma-expect',
|
'karma-expect',
|
||||||
'karma-edge-launcher',
|
'karma-edge-launcher',
|
||||||
'karma-chrome-launcher',
|
'karma-chrome-launcher',
|
||||||
'karma-safari-launcher',
|
'karma-safarinative-launcher',
|
||||||
'karma-firefox-launcher',
|
'karma-firefox-launcher',
|
||||||
'karma-time-stats-reporter'
|
'karma-time-stats-reporter'
|
||||||
],
|
],
|
||||||
@ -88,8 +88,7 @@ module.exports = function (config) {
|
|||||||
// - ChromeCanary
|
// - ChromeCanary
|
||||||
// - Firefox
|
// - Firefox
|
||||||
// - Opera
|
// - Opera
|
||||||
// - Safari (only Mac)
|
// - SafariNative (only Mac)
|
||||||
// - IE (only Windows)
|
|
||||||
browsers: ['Chrome1280x1024'],
|
browsers: ['Chrome1280x1024'],
|
||||||
|
|
||||||
customLaunchers: {
|
customLaunchers: {
|
||||||
@ -111,6 +110,12 @@ module.exports = function (config) {
|
|||||||
'dom.w3c_touch_events.enabled': 0
|
'dom.w3c_touch_events.enabled': 0
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
'FirefoxRetina': {
|
||||||
|
base: 'FirefoxHeadless',
|
||||||
|
prefs: {
|
||||||
|
'layout.css.devPixelsPerPx': 2
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
concurrency: 1,
|
concurrency: 1,
|
||||||
|
Reference in New Issue
Block a user