diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ff9224ce31d7a08c7c10f9a6ec321d39b2b21c58..7fc2645b8143e169002284f58e856eb5a5d2d47a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,8 +3,10 @@ stages: - install - test - build - #- release-android - release-linux + - release-windows + - release-mac + #- release-android variables: LC_ALL: C.UTF-8 @@ -58,15 +60,6 @@ test: script: - npm run e2e -# release-android: -# stage: release-android -# only: -# - tags -# - schedules -# - web -# script: -# - npm run release-android - release-linux: stage: release-linux only: @@ -75,3 +68,30 @@ release-linux: - web script: - npm run release-linux + +release-windows: + stage: release-windows + only: + - tags + - schedules + - web + script: + - npm run release-windows + +release-mac: + stage: release-mac + only: + - tags + - schedules + - web + script: + - npm run release-mac + +# release-android: +# stage: release-android +# only: +# - tags +# - schedules +# - web +# script: +# - npm run release-android diff --git a/README.md b/README.md index 1450ec588c1cb7b2b6b485175262172bba49c45f..07aa15a30c71bf28672746dfca40a0869efe1b5e 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ Then, back to the ngHyd project folder, run : `npm run e2e` -### To quickly end-to-end unit tests while watch mode is running +### To quickly run end-to-end unit tests while watch mode is running `npm run e2equick` diff --git a/package.json b/package.json index 339cd25eeea7d99576ee05c4a75b511c32eeb8a2..82a9b4ed1bf177a0985d83afe1779ca3979637f6 100644 --- a/package.json +++ b/package.json @@ -20,11 +20,13 @@ "update-dist-index-mimetypes": "node scripts/update-dist-index-mimetypes.js", "build-cordova": "npm run preprocess && npm run build && npm run update-dist-index-mimetypes && node scripts/add-cordova-script.js", "release-android": "npm run build-cordova && \"node_modules/.bin/cordova\" platform add android; node scripts/remove-duplicate-sitemap.js && \"node_modules/.bin/cordova\" build android && node scripts/move-cordova-release.js", - "copy-electron-icon-windows": "copy \"src\\android-chrome-512x512.png\" \"electron\\icon.png\" /Y", "electron": "npm run update-dist-index-mimetypes && \"node_modules/.bin/electron\" .", - "release-linux": "npm run build && npm run update-dist-index-mimetypes && \"node_modules/.bin/electron-builder\"", - "release-mac": "npm run build && npm run update-dist-index-mimetypes && \"node_modules/.bin/electron-builder\" --mac", - "release-windows": "node scripts/clean_release.js && npm run build && npm run update-dist-index-mimetypes && npm run copy-electron-icon-windows && \"node_modules/.bin/electron-builder\"", + "release-linux-nocompile": "npm run update-dist-index-mimetypes && \"node_modules/.bin/electron-builder\"", + "release-linux": "npm run build && npm run release-linux-nocompile", + "release-mac-nocompile": "npm run update-dist-index-mimetypes && \"node_modules/.bin/electron-builder\" --mac", + "release-mac": "npm run build && npm run release-mac-nocompile", + "release-windows-nocompile": "npm run update-dist-index-mimetypes && \"node_modules/.bin/electron-builder\" --win", + "release-windows": "npm run build && npm run release-windows-nocompile", "release-all": "node scripts/clean_release.js && npm run build && npm run update-dist-index-mimetypes && \"node_modules/.bin/electron-builder\" && \"node_modules/.bin/electron-builder\" --mac && \"node_modules/.bin/electron-builder\" --win && npm run release-android", "compodoc": "node \"node_modules/@compodoc/compodoc/bin/index-cli.js\" -p src/tsconfig.app.json -s --language fr-FR -d compodoc-fr", "viz": "tsviz -recursive src/ nghyd_class_diagram.png"