From 7d2f8c9e379255a2172c20bcdd562c8ac79badea Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Fri, 3 Jan 2020 09:57:23 +0100
Subject: [PATCH] Update releases-scripts and CI config
---
.gitlab-ci.yml | 40 ++++++++++++++++++++++++++++++----------
README.md | 2 +-
package.json | 10 ++++++----
3 files changed, 37 insertions(+), 15 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ff9224ce3..7fc2645b8 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 1450ec588..07aa15a30 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 339cd25ee..82a9b4ed1 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"
--
GitLab