Merge remote-tracking branch 'upstream/master'

CATcher-org · Mar 16, 2023 · 81cd91e · 81cd91e
2 parents 1b3c6b7 + 827e17d
commit 81cd91e
Show file tree

Hide file tree

Showing 31 changed files with 37 additions and 712 deletions.
diff --git a/.github/workflows/deployment-actions.yml b/.github/workflows/deployment-actions.yml
@@ -56,84 +56,3 @@ jobs:
       - name: Set upload_url Context
         id: set_upload_url
         run: echo "::set-output name=upload_url::${{ steps.draft_release.outputs.upload_url }}"
-
-  deploy_linux:
-    runs-on: ubuntu-latest
-    needs: draft_release
-    strategy:
-      matrix:
-        node-version: [14.x]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node-version }}
-      - name: Build
-        run: |
-          npm install
-          npm run electron:linux
-      - name: Upload Release Asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.draft_release.outputs.upload_url }}
-          asset_path: ./release/CATcher-${{ needs.draft_release.outputs.version_num }}.AppImage
-          asset_name: CATcher-${{ needs.draft_release.outputs.version_num }}.AppImage
-          asset_content_type: application/octet-stream
-
-  deploy_windows:
-    runs-on: windows-latest
-    needs: draft_release
-    strategy:
-      matrix:
-        node-version: [14.x]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node-version }}
-      - name: Build
-        run: |
-          npm install
-          npm run electron:windows
-      - name: Upload Release Asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.draft_release.outputs.upload_url }}
-          asset_path: ./release/CATcher ${{ needs.draft_release.outputs.version_num }}.exe
-          asset_name: CATcher-${{ needs.draft_release.outputs.version_num }}.exe
-          asset_content_type: application/octet-stream
-
-  deploy_macos:
-    runs-on: macos-latest
-    needs: draft_release
-    strategy:
-      matrix:
-        node-version: [14.x]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node-version }}
-      - name: Build
-        run: |
-          npm install
-          npm run electron:mac
-      - name: Upload Release Asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.draft_release.outputs.upload_url }}
-          asset_path: ./release/CATcher-${{ needs.draft_release.outputs.version_num }}.dmg
-          asset_name: CATcher-${{ needs.draft_release.outputs.version_num }}.dmg
-          asset_content_type: application/octet-stream
diff --git a/.gitignore b/.gitignore
@@ -8,7 +8,6 @@
 /release
 main.js
 src/**/*.js
-electron-utils/*.js
 *.js.map
 
 # tests coverage

diff --git a/electron-builder.json b/electron-builder.json
diff --git a/electron-utils/menu-bar.ts b/electron-utils/menu-bar.ts
diff --git a/electron-utils/oauth.ts b/electron-utils/oauth.ts
diff --git a/electron-utils/supporting-logic.ts b/electron-utils/supporting-logic.ts