diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8c92817..8f91ee6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -56,23 +56,12 @@ jobs: if [ "$RUNNER_OS" == "Windows" ]; then npx nx run open-lens:build:app --win nsis msi portable elif [ "$RUNNER_OS" == "Linux" ]; then - aarch64-linux-gnu-g++ --version - exit 1 - cd open-lens - env npm_config_target_arch=arm64 npm_config_arch=arm64 npm rebuild --loglevel silly node-pty - find . -name '*pty.node' -print0 | xargs -0 file - env npm_config_target_arch=arm64 npm_config_arch=arm64 npx @electron/rebuild -f -a arm64 - cd .. - find . -name '*pty.node' -print0 | xargs -0 file - exit 1 - - npx nx run open-lens:build:app --x64 - rm -rf node_modules - npm run all:install -- --arch=arm64 - find . -name '*pty.node' -print0 | xargs -0 file - env npm_config_target_arch=arm64 npm_config_arch=arm64 npm rebuild --verbose node-pty@0.10.1 - find . -name '*pty.node' -print0 | xargs -0 file + + apt update && apt install g++-aarch64-linux-gnu -y + export CXX=aarch64-linux-gnu-g++ + + npm run all:reinstall npx nx reset npx nx run open-lens:build:app --arm64 find . -name '*pty.node' -print0 | xargs -0 file diff --git a/update.js b/update.js index f75e499..e29d7bd 100644 --- a/update.js +++ b/update.js @@ -9,9 +9,8 @@ packageJsonOpenLens.build.publish = [{ }]; packageJsonOpenLens.version = `${packageJsonOpenLens.version}-${process.env.BUILD_ID}`; -packageJsonOpenLens.build.npmRebuild = os.platform() === 'darwin'; +packageJsonOpenLens.build.npmRebuild = true; packageJsonOpenLens.build.detectUpdateChannel = false; -packageJsonOpenLens.devDependencies["electron-builder"] = "^24.4.0" delete packageJsonOpenLens.scripts.postinstall;