Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/ci-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '18.x'
node-version: latest
- run: sudo apt-get install xvfb
- run: npm install --legacy-peer-deps
- run: npx playwright install
- run: npm install
- run: npx playwright install --with-deps
- run: npm install -g grunt-cli
- run: grunt default
- run: xvfb-run --auto-servernum -- npm test
- run: xvfb-run --auto-servernum -- npx playwright test --retries=3
# - run: xvfb-run --auto-servernum -- npm run jest
env:
CI: true
17 changes: 17 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ module.exports = function(grunt) {
'dist/map-feature.js': ['src/map-feature.js'],
'dist/map-extent.js': ['src/map-extent.js'],
'dist/map-input.js': ['src/map-input.js'],
'dist/map-select.js': ['src/map-select.js'],
'dist/map-link.js': ['src/map-link.js'],
'dist/map-style.js': ['src/map-style.js'],
'dist/map-area.js': ['src/map-area.js'],
'dist/layer.js': ['src/layer.js'],
'dist/leaflet.js': ['dist/leaflet-src.js',
Expand Down Expand Up @@ -155,6 +157,16 @@ module.exports = function(grunt) {
}
]
},
geoserver: {
files: [
{
expand: true,
cwd: 'dist',
src: ['*.js','*.map','*.css'],
dest: '../geoserver/src/extension/mapml/src/main/resources/viewer/widget'
}
]
},
docs: {
files: [
{
Expand All @@ -176,6 +188,10 @@ module.exports = function(grunt) {
options: {force: true},
src: ['../mapml-extension/src/dist']
},
geoserver: {
options: {force: true},
src: ['../geoserver/src/extension/mapml/src/main/resources/viewer/widget/*.js','../geoserver/src/extension/mapml/src/main/resources/viewer/widget/*.map','../geoserver/src/extension/mapml/src/main/resources/viewer/widget/*.css']
},
docs: {
options: {force: true},
src: ['../web-map-doc/dist']
Expand Down Expand Up @@ -218,6 +234,7 @@ module.exports = function(grunt) {
'uglify', 'cssmin','clean:tidyup']);
grunt.registerTask('experiments',['clean:experiments','default','copy:experiments']);
grunt.registerTask('extension',['clean:extension','default','copy:extension']);
grunt.registerTask('geoserver',['clean:geoserver','default','copy:geoserver']);
grunt.registerTask('docs', ['clean:docs','default','copy:docs']);
grunt.registerTask('sync', ['default','experiments','extension','docs']);

Expand Down
Loading