From 7af6a31f55dda63c79a8591521778fde0616dad0 Mon Sep 17 00:00:00 2001
From: Jai-JAP <jai.jap.318@gmail.com>
Date: Sat, 23 Dec 2023 14:55:22 +0530
Subject: [PATCH] Fix a few other errors & remove old code

---
 .github/workflows/build.yml | 56 +------------------------------------
 1 file changed, 1 insertion(+), 55 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b74c5f69..b10280b0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -54,7 +54,6 @@ jobs:
     - name: Install deps
       run: |
         sudo -H pip3 install setuptools
-        npm config set python python3
         sudo npm i -g yarn
         yarn --network-timeout 1000000
       env:
@@ -185,7 +184,6 @@ jobs:
     - name: Install npm_modules (amd64)
       run: |
           npm i -g yarn node-gyp
-          npm prefix -g | $(npm config set node_gyp "$_/node_modules/node-gyp/bin/node-gyp.js")
           yarn --network-timeout 1000000 --arch=${{matrix.build-arch}} --target-arch=${{matrix.build-arch}}
       if: matrix.build-arch == 'x64'
 
@@ -223,53 +221,6 @@ jobs:
       run: zsh -c 'tar czf tabby-web.tar.gz (tabby-*|web)/dist'
       if: matrix.build-arch == 'x64'
 
-#     - name: Install deps and Build (arm64)
-#       uses: docker://multiarch/ubuntu-core:arm64-bionic
-#       with:
-#           args: >
-#             bash -c
-#             "apt update && apt install curl lsb-release gnupg -y &&
-#             curl -fsSL https://deb.nodesource.com/setup_16.x | bash - &&
-#             apt install make build-essential git ruby libarchive-tools nodejs rpm libsecret-1-dev libfontconfig1-dev -y &&
-#             git config --global --add safe.directory /github/workspace &&
-#             gem install public_suffix -v 4.0.7 &&
-#             gem install fpm --no-document &&
-#             npm i -g yarn &&
-#             cd /github/workspace &&
-#             yarn --network-timeout 1000000 &&
-#             yarn run build &&
-#             scripts/prepackage-plugins.mjs &&
-#             USE_SYSTEM_FPM=true scripts/build-linux.mjs"
-#       env:
-#         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#         KEYGEN_TOKEN: ${{ secrets.KEYGEN_TOKEN }}
-#         USE_HARD_LINKS: false
-#       if: matrix.build-arch == 'arm64' && github.repository == 'Eugeny/tabby' && startsWith(github.ref, 'refs/tags')
-
-#     - name: Install deps and Build (armv7l)
-#       uses: docker://multiarch/ubuntu-core:armhf-bionic
-#       with:
-#           args: >
-#             bash -c
-#             "apt update && apt install curl lsb-release gnupg -y &&
-#             curl -fsSL https://deb.nodesource.com/setup_16.x | bash - &&
-#             apt install make build-essential git ruby libarchive-tools nodejs rpm libsecret-1-dev libfontconfig1-dev -y &&
-#             git config --global --add safe.directory /github/workspace &&
-#             gem install public_suffix -v 4.0.7 &&
-#             gem install fpm --no-document &&
-#             npm i -g yarn &&
-#             cd /github/workspace &&
-#             sed -i '/    \"electron\":/c\    \"electron\": \"17.0.0\",' package.json &&
-#             yarn --network-timeout 1000000 &&
-#             yarn run build &&
-#             scripts/prepackage-plugins.mjs &&
-#             USE_SYSTEM_FPM=true scripts/build-linux.mjs"
-#       env:
-#         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#         KEYGEN_TOKEN: ${{ secrets.KEYGEN_TOKEN }}
-#         USE_HARD_LINKS: false
-#       if: matrix.build-arch == 'arm' && github.repository == 'Eugeny/tabby' && startsWith(github.ref, 'refs/tags')
-
     - name: Upload symbols (amd64 only)
       run: |
         sudo npm install -g @sentry/cli --unsafe-perm
@@ -348,15 +299,10 @@ jobs:
       with:
         node-version: 18
 
-    - name: Update node-gyp
-      run: |
-        npm install --global node-gyp@8.4.1
-        npm prefix -g | % {npm config set node_gyp "$_\node_modules\node-gyp\bin\node-gyp.js"}
-
     - name: Build
       shell: powershell
       run: |
-        npm i -g yarn@1.19.1
+        npm i -g yar node-gyp
         yarn --network-timeout 1000000
         yarn run build
         node scripts/prepackage-plugins.mjs