From 3e2f93c226208c753682f095ac30c94a9d3963fc Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Sat, 30 Apr 2022 09:49:40 -0700 Subject: [PATCH] autorebuild native modules --- .github/workflows/build.yml | 15 --------------- HACKING.md | 3 --- appveyor.yml | 28 ---------------------------- package.json | 2 +- snap/snapcraft.yaml | 1 - 5 files changed, 1 insertion(+), 48 deletions(-) delete mode 100644 appveyor.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ec6cf227..8e391984 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,14 +53,7 @@ jobs: - name: Install deps run: | sudo npm i -g yarn@1.22.1 - 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 yarn@1.19.1 - 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 yarn@1.19.1 yarn --network-timeout 1000000 - node scripts/build-native.js yarn run build node scripts/prepackage-plugins.js env: diff --git a/HACKING.md b/HACKING.md index 065ad94f..3a25499f 100644 --- a/HACKING.md +++ b/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: diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 321fa9c3..00000000 --- a/appveyor.yml +++ /dev/null @@ -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" diff --git a/package.json b/package.json index 7c6855b1..da9774c6 100644 --- a/package.json +++ b/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" diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index b440b798..603d96fd 100644 --- a/snap/snapcraft.yaml +++ b/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