Merge remote-tracking branch 'origin/v3-refactor3' into v3-refactor3

.gitlab-ci.yml

@@ -27,6 +27,7 @@ windows_bin:
     - wget -O - https://cdn01.moecube.com/ygopro-build-materials/mycard-mat/mycard-mat-windows.tar.gz | tar zxf -
 
 windows:
+#  image: stefanscherer/node-windows:12-build-tools
   stage: build
   dependencies:
     - windows_bin
@@ -53,11 +54,11 @@ linux:
     - npm ci
     - npm run build
     - npm run dist
-    - ls
+    - ls dist
   artifacts:
     paths:
-      - dist/mycard-*
-      - dist/mycard_*
+      - dist/latest-linux.yml
+      - dist/*.AppImage
 macOS:
   stage: build
   tags:
@@ -69,16 +70,18 @@ macOS:
     APPLE_ID_PASSWORD: $MACOS_NOTARIZE_PASSWORD
     TEAM_SHORT_NAME: $MACOS_ASC_PROVIDER
   script:
+    - '[[ -z "$CI_COMMIT_TAG" ]] && export TRAVIS_BRANCH="_no_notarize"'
     - npm ci
     - npm run build
     - npm run dist
-    - ls
   artifacts:
     paths:
-      - dist/mycard-*
-      - dist/mycard_*
+      - dist/latest-mac.yml
+      - dist/*.dmg
+      - dist/*.blockmap
+      - dist/*.zip
 
-upload_to_minio:
+deploy:
   stage: deploy
   dependencies:
     - macOS
@@ -86,7 +89,9 @@ upload_to_minio:
     - linux
   tags:
     - linux
-  image: bitnami/aws-cli
+  image:
+    name: amazon/aws-cli
+    entrypoint: [""]
   script:
     - aws s3 --endpoint=https://minio.mycard.moe:9000 sync dist/ s3://mycard/mycard-ci-test
 #  only:

package.json

@@ -9,6 +9,7 @@
     "watch": "ng build --localize --base-href .. --watch --configuration development",
     "pack": "electron-builder --dir",
     "dist": "electron-builder",
+    "dist:mac": "electron-builder --universal",
     "i18n:extract": "ng extract-i18n",
     "i18n:upload": "tx push --source",
     "i18n:translate": "open https://www.transifex.com/mycard/mycard/translate/#en_US/messages-xlf?q=translated%3Ano",