Skip to content

Commit 749e59d

Browse files
author
Alberto Iannaccone
committed
fix generation of updater channel files in CI
1 parent f660058 commit 749e59d

File tree

4 files changed

+418
-334
lines changed

4 files changed

+418
-334
lines changed

Diff for: .github/workflows/build.yml

+1-12
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,7 @@ jobs:
6060
if [ $IS_FORK = true ]; then
6161
echo "Skipping the app signing: building from a fork."
6262
else
63-
export BUILD_SUFFIX="linux";
6463
if [ "${{ runner.OS }}" = "macOS" ]; then
65-
export BUILD_SUFFIX="mac";
6664
export CSC_LINK="${{ runner.temp }}/signing_certificate.p12"
6765
# APPLE_SIGNING_CERTIFICATE_P12 secret was produced by following the procedure from:
6866
# https://www.kencochrane.com/2020/08/01/build-and-sign-golang-binaries-for-macos-with-github-actions/#exporting-the-developer-certificate
@@ -71,7 +69,6 @@ jobs:
7169
export CSC_KEY_PASSWORD="${{ secrets.KEYCHAIN_PASSWORD }}"
7270
7371
elif [ "${{ runner.OS }}" = "Windows" ]; then
74-
export BUILD_SUFFIX="";
7572
export CSC_LINK="${{ runner.temp }}/signing_certificate.pfx"
7673
npm config set msvs_version 2017 --global
7774
echo "${{ secrets.WINDOWS_SIGNING_CERTIFICATE_PFX }}" | base64 --decode > "$CSC_LINK"
@@ -81,15 +78,7 @@ jobs:
8178
fi
8279
8380
yarn --cwd ./electron/packager/
84-
yarn --cwd ./electron/packager/ package
85-
86-
export BUILD_PREFIX="stable"
87-
if [ "$IS_NIGHTLY" = true ]; then
88-
export BUILD_PREFIX="nightly"
89-
fi
90-
91-
mv electron/build/dist/latest-$BUILD_SUFFIX.yml electron/build/dist/$BUILD_PREFIX-$BUILD_SUFFIX.yml
92-
rm electron/build/dist/alpha* electron/build/dist/beta*
81+
yarn --cwd ./electron/packager/ package
9382
9483
- name: Upload [GitHub Actions]
9584
uses: actions/upload-artifact@v2

Diff for: electron/packager/config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ function getChannel() {
106106
return 'nightly';
107107
}
108108

109-
return 'none';
109+
return '';
110110
}
111111

112112
function timestamp() {

0 commit comments

Comments
 (0)