浏览代码

autorebuild native modules

Eugene Pankov 3 年之前
父节点
当前提交
3e2f93c226
共有 5 个文件被更改,包括 1 次插入48 次删除
  1. 0 15
      .github/workflows/build.yml
  2. 0 3
      HACKING.md
  3. 0 28
      appveyor.yml
  4. 1 1
      package.json
  5. 0 1
      snap/snapcraft.yaml

+ 0 - 15
.github/workflows/build.yml

@@ -53,14 +53,7 @@ jobs:
     - name: Install deps
       run: |
         sudo npm i -g [email protected]
-        cd app
         yarn --network-timeout 1000000
-        cd ..
-        rm app/node_modules/.yarn-integrity
-        yarn --network-timeout 1000000
-
-    - name: Build native deps
-      run: scripts/build-native.js
       env:
         ARCH: ${{matrix.arch}}
 
@@ -150,14 +143,7 @@ jobs:
         sudo apt-get update
         sudo apt-get install libarchive-tools zsh
         npm i -g [email protected]
-        cd app
         yarn --network-timeout 1000000
-        cd ..
-        rm app/node_modules/.yarn-integrity
-        yarn --network-timeout 1000000
-
-    - name: Build native deps
-      run: scripts/build-native.js
 
     - name: Webpack
       run: yarn run build
@@ -269,7 +255,6 @@ jobs:
       run: |
         npm i -g [email protected]
         yarn --network-timeout 1000000
-        node scripts/build-native.js
         yarn run build
         node scripts/prepackage-plugins.js
       env:

+ 0 - 3
HACKING.md

@@ -11,7 +11,6 @@ First, install the dependencies:
 ```
 # macOS:
 yarn
-./scripts/build-native.js
 ```
 
 **Note: For compiling for Linux armv7l, you need to downgrade electron to 17.0.0 in package.json present in root directory of tabby source**
@@ -20,14 +19,12 @@ yarn
 # Linux (Debian/Ubuntu here as an example)
 sudo apt install libfontconfig-dev libsecret-1-dev libarchive-tools libnss3 libatk1.0-0 libatk-bridge2.0-0 libgdk-pixbuf2.0-0 libgtk-3-0 libgbm1 cmake
 yarn
-./scripts/build-native.js
 ```
 
 ```
 # Windows:
 npm -g install windows-build-tools
 yarn
-node scripts\build-native.js
 ```
 
 Now, check if your build is working:

+ 0 - 28
appveyor.yml

@@ -1,28 +0,0 @@
-os: Visual Studio 2017
-
-platform:
-  - x64
-
-environment:
-  nodejs_version: "14"
-
-version: "{build}"
-
-install:
-  - ps: Install-Product node $env:nodejs_version $env:platform
-  - yarn
-  - node scripts/build-native.js
-
-build_script:
-  - yarn run build
-  - node scripts/prepackage-plugins.js
-  - node scripts/build-windows.js
-
-artifacts:
-  - path: 'dist\*.exe'
-
-cache:
-  - node_modules
-  - "*\\node_modules"
-  - "%USERPROFILE%\\.electron"
-  - "%LOCALAPPDATA%\\Yarn"

+ 1 - 1
package.json

@@ -102,7 +102,7 @@
     "prod": "cross-env TABBY_DEV=1 electron app",
     "docs": "node scripts/build-docs.js",
     "lint": "eslint --ext ts */src */lib",
-    "postinstall": "patch-package && node ./scripts/install-deps.js",
+    "postinstall": "patch-package && node ./scripts/install-deps.js && node ./scripts/build-native.js",
     "i18n:pull": "crowdin pull --skip-untranslated-strings",
     "i18n:extract": "node scripts/i18n-extract.js",
     "i18n:push": "crowdin push"

+ 0 - 1
snap/snapcraft.yaml

@@ -19,7 +19,6 @@ parts:
       - libfontconfig-dev
     override-build: |
       yarn
-      ./scripts/build-native.js
       yarn run build
       ./scripts/build-linux.js
       mkdir -p $SNAPCRAFT_PART_INSTALL/opt/tabby || true