From 851219f835ed037d9fd970f538095e4b339c5342 Mon Sep 17 00:00:00 2001 From: Akis Kesoglou Date: Wed, 1 Feb 2023 11:14:18 +0200 Subject: [PATCH 1/2] Lazily import Electron from child-writer process MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No idea how this *used* to work, but it doesn’t since 887ec428 and this is fixing it properly. Change-type: patch --- lib/shared/utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/shared/utils.ts b/lib/shared/utils.ts index 100672b8..b1299a8d 100755 --- a/lib/shared/utils.ts +++ b/lib/shared/utils.ts @@ -15,7 +15,6 @@ */ import axios from 'axios'; -import { app, remote } from 'electron'; import { Dictionary } from 'lodash'; import * as errors from './errors'; @@ -50,6 +49,7 @@ export async function delay(duration: number): Promise { } export function getAppPath(): string { + const { app, remote } = require('electron'); return ( (app || remote.app) .getAppPath() From 48ddafd120cc9cd4fb94c0d6f7530a14be46f28d Mon Sep 17 00:00:00 2001 From: Akis Kesoglou Date: Tue, 31 Jan 2023 14:47:18 +0200 Subject: [PATCH 2/2] Remove redundant resinci-deploy build step Change-type: patch --- .github/actions/publish/action.yml | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/.github/actions/publish/action.yml b/.github/actions/publish/action.yml index 268856df..822e0760 100644 --- a/.github/actions/publish/action.yml +++ b/.github/actions/publish/action.yml @@ -46,32 +46,6 @@ runs: run: choco install yq if: runner.os == 'Windows' - # FIXME: resinci-deploy is not actively maintained - # https://github.com/product-os/resinci-deploy - - name: Checkout resinci-deploy - uses: actions/checkout@v3 - with: - repository: product-os/resinci-deploy - token: ${{ fromJSON(inputs.secrets).FLOWZONE_TOKEN }} - path: resinci-deploy - - - name: Build and install resinci-deploy - shell: bash --noprofile --norc -eo pipefail -x {0} - run: | - set -ea - - [[ '${{ inputs.VERBOSE }}' =~ on|On|Yes|yes|true|True ]] && set -x - - runner_os="$(echo "${RUNNER_OS}" | tr '[:upper:]' '[:lower:]')" - - rm -rf ../resinci-deploy && mv resinci-deploy .. - - pushd ../resinci-deploy && npm ci && npm link && popd - - if [[ $runner_os =~ linux|macos ]]; then - chmod +x "$(dirname "$(which node)")/resinci-deploy" && which resinci-deploy - fi - # https://www.electron.build/code-signing.html # https://github.com/Apple-Actions/import-codesign-certs - name: Import Apple code signing certificate