drop "travis ci" use

vladimiry · Nov 16, 2021 · ed10daf · ed10daf
1 parent 1b3680f
commit ed10daf
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 112 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -94,7 +94,7 @@ jobs:
       - { name: print ./app files, shell: bash, run: ./scripts/ci/list-fs-content.sh ./app }
       - { name: build, if: runner.os == 'Windows', run: ./scripts/ci/github/package-app.ps1 }
       - { name: build, if: runner.os == 'Linux', run: ./scripts/ci/github/package-app-linux.sh }
-      - { name: build, if: matrix.os == 'macos-10.15', run: ./scripts/ci/github/package-app-osx.sh, env: { ARTIFACT_NAME_POSTFIX: "-catalina" } }
+      - { name: build, if: matrix.os == 'macos-10.15', run: ./scripts/ci/github/package-app-osx.sh, env: { MACOSX_DEPLOYMENT_TARGET: "10.13" } }
       - name: upload e2e/spectron output
         if: ${{ always() }}
         uses: actions/upload-artifact@v2

diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -6,7 +6,6 @@ ElectronMail is an [Electron](https://electronjs.org)-based unofficial desktop c
 It is written in [TypeScript](http://www.typescriptlang.org) and uses [Angular](https://angular.io).
 
 [![GitHub Actions CI](https://img.shields.io/github/workflow/status/vladimiry/ElectronMail/GitHub%20Actions%20CI?branch=master&style=flat-square&logo=github&label=GitHub%20Actions%20CI)](https://github.com/vladimiry/ElectronMail/actions)
-[![Travis CI](https://img.shields.io/travis/com/vladimiry/ElectronMail.svg?branch=master&style=flat-square&logo=travis&label=Travis+CI)](https://travis-ci.com/github/vladimiry/ElectronMail)
 [![License](https://img.shields.io/github/license/vladimiry/ElectronMail.svg?style=flat-square&label=License)](https://github.com/vladimiry/ElectronMail/blob/master/LICENSE)
 [![GitHub top language](https://img.shields.io/github/languages/top/vladimiry/ElectronMail.svg?style=flat-square&label=TypeScript)](https://github.com/vladimiry/ElectronMail/search?l=typescript)
 

diff --git a/electron-builder.yml b/electron-builder.yml
@@ -1,5 +1,5 @@
 appId: 'github.com/vladimiry/ElectronMail'
-artifactName: ${name}-${version}-${os}-${arch}${env.ARTIFACT_NAME_POSTFIX}.${ext}
+artifactName: ${name}-${version}-${os}-${arch}.${ext}
 productName: 'ElectronMail'
 publish: {provider: github, releaseType: draft, vPrefixedTagName: true}
 forceCodeSigning: false

diff --git a/package.json b/package.json
@@ -66,17 +66,15 @@
     "assets:webclient": "yarn assets:webclient:base ./app",
     "assets:webclient:dev": "yarn assets:webclient:base ./app-dev",
     "assets:webclient:base": "yarn ts-node:shortcut ./scripts/prepare-webclient/index.ts",
-    "electron-builder:install-app-deps": "electron-builder install-app-deps --arch=x64",
-    "electron-builder:dir": "electron-builder --x64 --dir",
-    "electron-builder:dist": "cross-env TS_NODE_FILES=true npm exec --package=ts-node --node-options=\"--require tsconfig-paths/register --loader ts-node/esm --experimental-json-modules\" -- ts-node ./scripts/electron-builder/run-with-default-evn-vars.ts --x64 --publish never",
-    "electron-builder:dist:linux:appimage": "cross-env TS_NODE_FILES=true npm exec --package=ts-node --node-options=\"--require tsconfig-paths/register --loader ts-node/esm --experimental-json-modules\" -- ts-node ./scripts/electron-builder/build-appimage.ts",
-    "electron-builder:dist:linux:appimage:do": "cross-env TS_NODE_FILES=true npm exec --package=ts-node --node-options=\"--require tsconfig-paths/register --loader ts-node/esm --experimental-json-modules\" -- ts-node ./scripts/electron-builder/run-with-default-evn-vars.ts --x64 --publish never --linux appimage",
-    "electron-builder:dist:linux:snap": "cross-env TS_NODE_FILES=true npm exec --package=ts-node --node-options=\"--require tsconfig-paths/register --loader ts-node/esm --experimental-json-modules\" -- ts-node ./scripts/electron-builder/build-snap.ts",
-    "electron-builder:dist:linux:snap:do": "cross-env TS_NODE_FILES=true npm exec --package=ts-node --node-options=\"--require tsconfig-paths/register --loader ts-node/esm --experimental-json-modules\" -- ts-node ./scripts/electron-builder/run-with-default-evn-vars.ts --x64 --publish never --linux snap",
-    "electron-builder:dist:linux:deb": "cross-env TS_NODE_FILES=true npm exec --package=ts-node --node-options=\"--require tsconfig-paths/register --loader ts-node/esm --experimental-json-modules\" -- ts-node ./scripts/electron-builder/run-with-default-evn-vars.ts --x64 --publish never --linux deb",
-    "electron-builder:dist:linux:freebsd": "cross-env TS_NODE_FILES=true npm exec --package=ts-node --node-options=\"--require tsconfig-paths/register --loader ts-node/esm --experimental-json-modules\" -- ts-node ./scripts/electron-builder/run-with-default-evn-vars.ts --x64 --publish never --linux freebsd",
-    "electron-builder:dist:linux:pacman": "cross-env TS_NODE_FILES=true npm exec --package=ts-node --node-options=\"--require tsconfig-paths/register --loader ts-node/esm --experimental-json-modules\" -- ts-node ./scripts/electron-builder/run-with-default-evn-vars.ts --x64 --publish never --linux pacman",
-    "electron-builder:dist:linux:rpm": "cross-env TS_NODE_FILES=true npm exec --package=ts-node --node-options=\"--require tsconfig-paths/register --loader ts-node/esm --experimental-json-modules\" -- ts-node ./scripts/electron-builder/run-with-default-evn-vars.ts --x64 --publish never --linux rpm",
+    "electron-builder:dist": "npm run electron-builder:shortcut -- --x64 --publish never",
+    "electron-builder:dist:linux:appimage": "yarn ts-node:shortcut ./scripts/electron-builder/build-appimage.ts",
+    "electron-builder:dist:linux:appimage:do": "npm run electron-builder:shortcut -- --x64 --publish never --linux appimage",
+    "electron-builder:dist:linux:snap": "yarn ts-node:shortcut ./scripts/electron-builder/build-snap.ts",
+    "electron-builder:dist:linux:snap:do": "npm run electron-builder:shortcut -- --x64 --publish never --linux snap",
+    "electron-builder:dist:linux:deb": "npm run electron-builder:shortcut -- --x64 --publish never --linux deb",
+    "electron-builder:dist:linux:freebsd": "npm run electron-builder:shortcut -- --x64 --publish never --linux freebsd",
+    "electron-builder:dist:linux:pacman": "npm run electron-builder:shortcut -- --x64 --publish never --linux pacman",
+    "electron-builder:dist:linux:rpm": "npm run electron-builder:shortcut -- --x64 --publish never --linux rpm",
     "lint": "npm-run-all scripts/code-generation/electron-main lint:code",
     "lint:code": "npm-run-all lint:ts:eslint",
     "lint:ts:base:eslint": "eslint",
@@ -91,6 +89,7 @@
     "scripts/dist-packages/upload": "yarn ts-node:shortcut ./scripts/dist-packages/upload.ts ./dist ./output",
     "scripts/download-tray-icon-font": "yarn ts-node:shortcut ./scripts/download-tray-icon-font.ts",
     "scripts/transfer": "yarn ts-node:shortcut ./scripts/transfer/index.ts",
+    "electron-builder:shortcut": "npm exec --package=electron-builder -- electron-builder",
     "ts-node:shortcut": "cross-env TS_NODE_FILES=true npm exec --package=ts-node --node-options=\"--require tsconfig-paths/register --loader ts-node/esm --experimental-json-modules\" -- ts-node",
     "webpack:shortcut": "cross-env TS_NODE_FILES=true TS_NODE_PROJECT=./webpack-configs/tsconfig.json npm exec --package=webpack-cli --node-options=\"--require tsconfig-paths/register --loader ts-node/esm --experimental-json-modules\" -- webpack"
   },

diff --git a/scripts/ci/travis/build-osx.sh b/scripts/ci/travis/build-osx.sh
diff --git a/scripts/const.ts b/scripts/const.ts
@@ -1,8 +1,5 @@
-// TODO resolve "ARTIFACT_NAME_POSTFIX" value programmatically from "electron-builder.yml"
 import path from "path";
 
-export const ARTIFACT_NAME_POSTFIX_ENV_VAR_NAME = "ARTIFACT_NAME_POSTFIX";
-
 export const CWD_ABSOLUTE_DIR = path.resolve(process.cwd());
 
 export const OUTPUT_ABSOLUTE_DIR = path.join(CWD_ABSOLUTE_DIR, "./output");

diff --git a/scripts/electron-builder/run-with-default-evn-vars.ts b/scripts/electron-builder/run-with-default-evn-vars.ts