This commit is contained in:
Jan-Otto Kröpke 2023-06-15 09:35:39 +02:00
parent 237466bbb1
commit b54b49d412
No known key found for this signature in database
2 changed files with 13 additions and 3 deletions

View File

@ -44,6 +44,9 @@ jobs:
- name: Build Lens - name: Build Lens
run: | run: |
npm run all:install npm run all:install
# 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
if [ "${CSC_LINK}" = "" ] || [ "${CSC_KEY_PASSWORD}" = "" ]; then if [ "${CSC_LINK}" = "" ] || [ "${CSC_KEY_PASSWORD}" = "" ]; then
unset CSC_LINK unset CSC_LINK
@ -54,6 +57,13 @@ jobs:
npx nx run open-lens:build:app --win nsis msi portable npx nx run open-lens:build:app --win nsis msi portable
elif [ "$RUNNER_OS" == "Linux" ]; then elif [ "$RUNNER_OS" == "Linux" ]; then
npx nx run open-lens:build:app --x64 --arm64 npx nx run open-lens:build:app --x64 --arm64
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
npx nx reset
npx nx run open-lens:build:app
find . -name '*pty.node' -print0 | xargs -0 file find . -name '*pty.node' -print0 | xargs -0 file
else else
npx nx run open-lens:build:app --x64 --arm64 npx nx run open-lens:build:app --x64 --arm64
@ -75,7 +85,7 @@ jobs:
WIN_CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD_WIN }} WIN_CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD_WIN }}
CSC_FOR_PULL_REQUEST: true CSC_FOR_PULL_REQUEST: true
DOWNLOAD_ALL_ARCHITECTURES: ${{ runner.os != 'Windows' }} DOWNLOAD_ALL_ARCHITECTURES: ${{ runner.os != 'Windows' }}
DEBUG: electron-rebuild
- name: Calculate SHA256 checksum - name: Calculate SHA256 checksum
run: |- run: |-
if command -v shasum 2>/dev/null 1>&2; then if command -v shasum 2>/dev/null 1>&2; then

View File

@ -9,9 +9,9 @@ packageJsonOpenLens.build.publish = [{
}]; }];
packageJsonOpenLens.version = `${packageJsonOpenLens.version}-${process.env.BUILD_ID}`; packageJsonOpenLens.version = `${packageJsonOpenLens.version}-${process.env.BUILD_ID}`;
packageJsonOpenLens.build.npmRebuild = true; packageJsonOpenLens.build.npmRebuild = os.platform() === 'darwin';
packageJsonOpenLens.build.detectUpdateChannel = false; packageJsonOpenLens.build.detectUpdateChannel = false;
packageJsonOpenLens.devDependencies["electron-builder"] = "^24.4.0" packageJsonOpenLens.devDependencies["electron-builder"] = "^24.6.0"
delete packageJsonOpenLens.scripts.postinstall; delete packageJsonOpenLens.scripts.postinstall;