Skip to content

Commit 9b827cc

Browse files
authored
Merge pull request #1190 from piskelapp/ci-updates
CI update
2 parents 8fc2af1 + c0312bf commit 9b827cc

File tree

5 files changed

+24
-4
lines changed

5 files changed

+24
-4
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: E2E Tests
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
8+
jobs:
9+
e2e:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v4
13+
- uses: actions/setup-node@v4
14+
with:
15+
node-version: '20'
16+
- run: npm run test-ci

Gruntfile.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,6 @@ module.exports = function (grunt) {
335335
// ALIASES, kept for backward compatibility
336336
grunt.registerTask('serve-debug', ['play']);
337337
grunt.registerTask('serve-dev', ['play']);
338-
grunt.registerTask('test-travis', ['test']);
339338
grunt.registerTask('test-local', ['test']);
340339

341340
// Default task

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
Piskel
22
======
33

4-
[![Travis Status](https://api.travis-ci.org/piskelapp/piskel.png?branch=master)](https://travis-ci.org/piskelapp/piskel) [![Built with Grunt](https://cdn.gruntjs.com/builtwith.png)](https://gruntjs.com/)
5-
64
Piskel is an easy-to-use sprite editor. It can be used to create game sprites, animations, pixel-art...
75
It is the editor used in **[piskelapp.com](https://www.piskelapp.com)**.
86

@@ -25,6 +23,7 @@ We also use the following **libraries** :
2523
* [canvas-toBlob](https://github.com/eligrey/canvas-toBlob.js/) : shim for canvas toBlob
2624
* [jquery](https://jquery.com/) : used sporadically in the application
2725
* [bootstrap-tooltip](https://getbootstrap.com/javascript/#tooltips) : nice tooltips
26+
* [playwright](https://playwright.dev/): End to end testing
2827

2928
As well as some **icons** from the [Noun Project](https://thenounproject.com/) :
3029
* Folder by Simple Icons from The Noun Project

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
"e2e:interactive": "npx playwright test --ui",
3838
"unit-tests": "karma start",
3939
"unit-tests:watch": "karma start --auto-watch --no-single-run",
40-
"test": "npm run unit-tests; npm run e2e"
40+
"test": "npm run unit-tests; npm run e2e",
41+
"test-ci": "bash ./run-test-ci.sh"
4142
},
4243
"devDependencies": {
4344
"@playwright/test": "^1.52.0",

run-test-ci.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
npm run unit-tests
2+
UT=$?
3+
npm run e2e
4+
E2E=$?
5+
exit $((UT + E2E))

0 commit comments

Comments
 (0)