diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 849a217..10995de 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -58,18 +58,6 @@ jobs: sudo apt update sudo apt install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu -y - #npx nx run open-lens:build:app --arm64 - #find . -name '*pty.node' -print0 | xargs -0 file - - #npx nx run open-lens:build:app - #npm run all:reinstall - #npx nx reset - - #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++ - #mkdir -p open-lens/node_modules - npx nx run open-lens:build:app --x64 --arm64 find . -name '*pty.node' -print0 | xargs -0 file else diff --git a/.gitignore b/.gitignore index b12d9d7..dddb8b5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .DS_Store README.md +/lens/ diff --git a/build-hooks/beforeBuild.js b/build-hooks/beforeBuild.js index 75e0513..216adb5 100644 --- a/build-hooks/beforeBuild.js +++ b/build-hooks/beforeBuild.js @@ -1,3 +1,18 @@ -module.exports = async (appDir, electronVersion, platform, arch) => { - console.log(appDir, electronVersion, platform, arch) +const archMap = { + "amd64": "x86_64", + "arm64": "aarch64", +} + +module.exports = async (buildContext) => { + if (buildContext.platform !== "linux") return true + + if (buildContext.arch in archMap) { + process.env.CC = `${archMap[buildContext.arch]}-linux-gnu-gcc` + process.env.CXX = `${archMap[buildContext.arch]}-linux-gnu-g++` + } else { + process.env.CC = "gcc" + process.env.CXX = "g++" + } + + return true }