From 0f3f0c75718179da6bf28bf6b0c1fc8e9ae2689c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Thu, 15 Jun 2023 21:43:40 +0200 Subject: [PATCH] debug --- .github/workflows/main.yml | 4 ++-- update.js | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 24fe272..bf724ac 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,7 +42,7 @@ jobs: - name: Build Lens run: | - npm run all:install -- --arch=arm64 + # Avoid npm install from electron-builder # ref: https://github.com/electron-userland/electron-builder/blob/80a3ae857b9305aff1774e1b2b932601af50231b/packages/app-builder-lib/src/util/yarn.ts#L11-L16 mkdir -p open-lens/node_modules @@ -57,7 +57,7 @@ jobs: elif [ "$RUNNER_OS" == "Linux" ]; then sudo apt update sudo apt install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu -y - export CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ npm_config_target_arch=arm64 npm_config_arch=arm64 + env CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ npm_config_target_arch=arm64 npm_config_arch=arm64 npm run all:install npx nx run open-lens:build:app --arm64 find . -name '*pty.node' -print0 | xargs -0 file exit 1 diff --git a/update.js b/update.js index 359aaa8..858147e 100644 --- a/update.js +++ b/update.js @@ -1,4 +1,5 @@ const fs = require('fs'); +const os = require('os'); const packageJsonOpenLens = require('./lens/open-lens/package.json'); @@ -8,7 +9,7 @@ packageJsonOpenLens.build.publish = [{ }]; packageJsonOpenLens.version = `${packageJsonOpenLens.version}-${process.env.BUILD_ID}`; -packageJsonOpenLens.build.npmRebuild = true; +packageJsonOpenLens.build.npmRebuild = os.platform() === 'darwin'; packageJsonOpenLens.build.detectUpdateChannel = false; packageJsonOpenLens.copyright = [