From d69f108207aecced0230b85800cabc475af51b67 Mon Sep 17 00:00:00 2001 From: Jaifroid Date: Sun, 13 Mar 2022 18:04:57 +0000 Subject: [PATCH] Fix build errors Former-commit-id: 022946aa8259ab78094fffbca34f1d34b9fbf315 [formerly b93ae4079c51dc14afb36f19793fadad72bc2b96] [formerly a06a447e883a99e54a8d77f5d20e15994de10ec7] [formerly 784cf0029b178373343fd8db8846f3599302cb14 [formerly b1a914bcdc449d6bd6b46ccbf862d234ee144971 [formerly 80fb4c257a52364d1cde3cf027efd71a812ec745]]] Former-commit-id: c4622f01d029c2c9d36fc0c89ad99af18687aa00 [formerly e29bbc6789ddc1204cf96b2a1cd635993cd8ceec [formerly 116948e8b50f6b49b3629d1c25397cbbb9c77198]] Former-commit-id: 8a57b9acf2db0e7ebdba570d6a5872d79c231544 [formerly 2c96de4bfd5e76b8f11aeeeaf0ceae92be6652c1] Former-commit-id: 8ad95922440aaf5f16cbbe5fd7276edf4d24cb2e --- .github/workflows/build-electron.yml | 6 +++--- scripts/Rewrite-AppVersion.ps1 | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-electron.yml b/.github/workflows/build-electron.yml index f2355048..4df95e2f 100644 --- a/.github/workflows/build-electron.yml +++ b/.github/workflows/build-electron.yml @@ -83,15 +83,15 @@ jobs: - name: rewrite app version number run: | $INPUT_VERSION = $Env:INPUT_VERSION - $INPUT_TARGET = $Env:INPUT_VERSION + $INPUT_TARGET = $Env:INPUT_TARGET $CRON_LAUNCHED = $Env:CRON_LAUNCHED ./scripts/Rewrite-AppVersion.ps1 - name: publish run: | - ./scripts/Build-NWJS:ps1 -only32bit + ./scripts/Build-NWJS.ps1 -only32bit $SSH_KEY = $Env:SSH_KEY echo "$SSH_KEY" > .\scripts\ssh_key $INPUT_VERSION = $Env:INPUT_VERSION - $INPUT_TARGET = $Env:INPUT_VERSION + $INPUT_TARGET = $Env:INPUT_TARGET $CRON_LAUNCHED = $Env:CRON_LAUNCHED ./scripts/Publish-ElectronPackages.ps1 \ No newline at end of file diff --git a/scripts/Rewrite-AppVersion.ps1 b/scripts/Rewrite-AppVersion.ps1 index 88fd10b4..ecad1eca 100644 --- a/scripts/Rewrite-AppVersion.ps1 +++ b/scripts/Rewrite-AppVersion.ps1 @@ -11,6 +11,10 @@ if ($customversion) { $INPUT_VERSION = $customversion } +if ($INPUT_TARGET -eq "nightly") { + $CRON_LAUNCHED = "1" +} + if ($INPUT_VERSION) { $VERSION = $INPUT_VERSION } elseif ($TAG_VERSION) {