Remove Docker, build all on GH Actions

Kong · May 27, 2020 · 9737076 · 9737076
1 parent d7f10ef
commit 9737076
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 192 deletions.
diff --git a/.github/actions/release-linux/Dockerfile b/.github/actions/release-linux/Dockerfile
diff --git a/.github/actions/release-linux/entrypoint.sh b/.github/actions/release-linux/entrypoint.sh
diff --git a/.github/actions/release-linux/install-dependencies.sh b/.github/actions/release-linux/install-dependencies.sh
diff --git a/.github/workflows/release-core.yml b/.github/workflows/release-core.yml
@@ -5,60 +5,59 @@ on:
     tags:
       - core@*
 
+env:
+  GH_TOKEN: ${{ secrets.GH_TOKEN }}
+  GITHUB_REF: ${{ github.ref }}
+  GITHUB_SHA: ${{ github.sha }}
+  NPM_CONFIG_TARGET: 3.1.13
+  NPM_CONFIG_DISTURL: https://electronjs.org/headers
+  NPM_CONFIG_RUNTIME: electron
+
 jobs:
   Windows:
     name: Windows
     runs-on: windows-2016
     steps:
-      - name: Checkout branch
-        uses: actions/checkout@v1
-      - name: Install NodeJS
-        uses: actions/setup-node@v1
+      - uses: actions/checkout@v1
+      - uses: actions/setup-node@v1
         with:
           node-version: 10
-      - name: Install node tools
-        run: npm install --global --production windows-build-tools@4
-      - name: Set node config to use python2.7
-        run: npm config set python python2.7
-      - name: Set node config to set msvs_version to 2015
-        run: npm config set msvs_version 2015
-      - name: Bootstrap packages
-        run: npm run bootstrap
-      - name: Run tests
-        run: npm test
-      - name: Release app
+      - run: npm install --global --production windows-build-tools@4
+      - run: npm config set python python2.7
+      - run: npm config set msvs_version 2015
+      - run: npm run bootstrap
+      - run: npm test
+      - run: npm run app-release
         env:
-          GITHUB_REF: ${{ github.ref }}
-          GITHUB_SHA: ${{ github.sha }}
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
-          CSC_LINK: ${{ secrets.WINDOWS_CSC_LINK }}
-          CSC_KEY_PASSWORD: ${{ secrets.WINDOWS_CSC_KEY_PASSWORD }}
-        run: npm run app-release
+          CSC_LINK: ${{ secrets.CORE_WINDOWS_CSC_LINK }}
+          CSC_KEY_PASSWORD: ${{ secrets.CORE_WINDOWS_CSC_KEY_PASSWORD }}
+  Mac:
+    name: Mac
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 10
+      - run: npm run bootstrap
+      - run: npm test
+      - run: npm run app-release
+        env:
+          APPLE_ID: ${{ secrets.CORE_APPLE_ID }}
+          APPLE_ID_PASSWORD: ${{ secrets.CORE_APPLE_ID_PASSWORD }}
+          CSC_LINK: ${{ secrets.CORE_MAC_CSC_LINK }}
+          CSC_KEY_PASSWORD: ${{ secrets.CORE_MAC_CSC_KEY_PASSWORD }}
   Linux:
     name: Linux
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout branch
-        uses: actions/checkout@v1
-      - name: Install NodeJS
-        uses: actions/setup-node@v1
+      - uses: actions/checkout@v1
+      - uses: actions/setup-node@v1
         with:
           node-version: 10
-      - name: Bootstrap packages
-        run: npm run bootstrap
-      - name: Run tests
-        run: npm test
-      - name: Release app
-        run: npm run app-release
+      - run: npm run bootstrap
+      - run: npm test
+      - run: npm run app-release
         env:
-          GITHUB_REF: ${{ github.ref }}
-          GITHUB_SHA: ${{ github.sha }}
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
           BUILD_TARGETS: AppImage,Snap,deb,tar.gz,rpm
           SNAPCRAFT_LOGIN_FILE: ${{ secrets.SNAPCRAFT_LOGIN_FILE }}
-env:
-  NPM_CONFIG_TARGET: 3.1.13
-  NPM_CONFIG_ARCH: x64
-  NPM_CONFIG_TARGET_ARCH: x64
-  NPM_CONFIG_DISTURL: https://electronjs.org/headers
-  NPM_CONFIG_RUNTIME: electron
diff --git a/.github/workflows/release-designer.yml b/.github/workflows/release-designer.yml
@@ -5,62 +5,59 @@ on:
     tags:
       - designer@*
 
+env:
+  GH_TOKEN: ${{ secrets.GH_TOKEN }}
+  GITHUB_REF: ${{ github.ref }}
+  GITHUB_SHA: ${{ github.sha }}
+  NPM_CONFIG_TARGET: 3.1.13
+  NPM_CONFIG_DISTURL: https://electronjs.org/headers
+  NPM_CONFIG_RUNTIME: electron
+
 jobs:
   Windows:
     name: Windows
     runs-on: windows-2016
     steps:
-      - name: Checkout branch
-        uses: actions/checkout@v1
-      - name: Install NodeJS
-        uses: actions/setup-node@v1
+      - uses: actions/checkout@v1
+      - uses: actions/setup-node@v1
         with:
           node-version: 10
-      - name: Install node tools
-        run: npm install --global --production windows-build-tools@4
-      - name: Set node config to use python2.7
-        run: npm config set python python2.7
-      - name: Set node config to set msvs_version to 2015
-        run: npm config set msvs_version 2015
-      - name: Bootstrap packages
-        run: npm run bootstrap
-      - name: Run tests
-        run: npm test
-      - name: Release app
-        run: npm run app-release
+      - run: npm install --global --production windows-build-tools@4
+      - run: npm config set python python2.7
+      - run: npm config set msvs_version 2015
+      - run: npm run bootstrap
+      - run: npm test
+      - run: npm run app-release
         env:
-          GITHUB_REF: ${{ github.ref }}
-          GITHUB_SHA: ${{ github.sha }}
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
           CSC_LINK: ${{ secrets.DESIGNER_WINDOWS_CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.DESIGNER_WINDOWS_CSC_KEY_PASSWORD }}
+  Mac:
+    name: Mac
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 10
+      - run: npm run bootstrap
+      - run: npm test
+      - run: npm run app-release
+        env:
+          APPLE_ID: ${{ secrets.DESIGNER_APPLE_ID }}
+          APPLE_ID_PASSWORD: ${{ secrets.DESIGNER_APPLE_ID_PASSWORD }}
+          CSC_LINK: ${{ secrets.DESIGNER_MAC_CSC_LINK }}
+          CSC_KEY_PASSWORD: ${{ secrets.DESIGNER_MAC_CSC_KEY_PASSWORD }}
   Linux:
     name: Linux
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-latest
     steps:
-      - name: Checkout branch
-        uses: actions/checkout@v1
-      - name: Install NodeJS
-        uses: actions/setup-node@v1
+      - uses: actions/checkout@v1
+      - uses: actions/setup-node@v1
         with:
           node-version: 10
-      - name: Bootstrap packages
-        run: npm run bootstrap
-      - name: Run tests
-        run: npm test
-      - name: Release app
-        run: npm run app-release
+      - run: npm run bootstrap
+      - run: npm test
+      - run: npm run app-release
         env:
-          GITHUB_REF: ${{ github.ref }}
-          GITHUB_SHA: ${{ github.sha }}
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
-          BUILD_TARGETS: AppImage,deb,tar.gz,rpm
-          # Don't build Snap for Designer (yet)
-          # BUILD_TARGETS: AppImage,Snap
-          # SNAPCRAFT_LOGIN_FILE: ${{ secrets.SNAPCRAFT_LOGIN_FILE }}
-env:
-  NPM_CONFIG_TARGET: 3.1.13
-  NPM_CONFIG_ARCH: x64
-  NPM_CONFIG_TARGET_ARCH: x64
-  NPM_CONFIG_DISTURL: https://electronjs.org/headers
-  NPM_CONFIG_RUNTIME: electron
+          BUILD_TARGETS: AppImage,Snap,deb,tar.gz,rpm
+          SNAPCRAFT_LOGIN_FILE: ${{ secrets.SNAPCRAFT_LOGIN_FILE }}
diff --git a/.travis.yml → .travis.xxxx.yml b/.travis.yml → .travis.xxxx.yml
diff --git a/packages/insomnia-app/config/config.designer.json b/packages/insomnia-app/config/config.designer.json
@@ -1,5 +1,5 @@
 {
-  "version": "2020.1.4-alpha.1",
+  "version": "2020.1.4-alpha.2",
   "name": "insomnia-designer",
   "executableName": "designer",
   "appId": "com.insomnia.designer",