summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/builds.yml3
-rw-r--r--build-helpers/notarize.js2
2 files changed, 1 insertions, 4 deletions
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index 1a93ab19a..5e94b6b9e 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -105,7 +105,6 @@ jobs:
105 echo "ELECTRON_CACHE=$HOME/.cache/electron" >> $GITHUB_ENV 105 echo "ELECTRON_CACHE=$HOME/.cache/electron" >> $GITHUB_ENV
106 echo "ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder" >> $GITHUB_ENV 106 echo "ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder" >> $GITHUB_ENV
107 echo "MANUAL_REBUILD_ON_NIGHTLY=${{ github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]') }}" >> $GITHUB_ENV 107 echo "MANUAL_REBUILD_ON_NIGHTLY=${{ github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]') }}" >> $GITHUB_ENV
108 echo "SKIP_NOTARIZATION=${{ !contains(github.repository_owner, 'ferdium') }}" >> $GITHUB_ENV
109 - name: Checkout code along with submodules for the 'nightly' branch if the trigger event is 'scheduled' or this is a forced rebuild on the nightly branch 108 - name: Checkout code along with submodules for the 'nightly' branch if the trigger event is 'scheduled' or this is a forced rebuild on the nightly branch
110 uses: actions/checkout@v2 109 uses: actions/checkout@v2
111 if: ${{ github.event_name == 'schedule' || env.MANUAL_REBUILD_ON_NIGHTLY == 'true' }} 110 if: ${{ github.event_name == 'schedule' || env.MANUAL_REBUILD_ON_NIGHTLY == 'true' }}
@@ -193,7 +192,6 @@ jobs:
193 echo "ELECTRON_CACHE=$HOME/.cache/electron" >> $GITHUB_ENV 192 echo "ELECTRON_CACHE=$HOME/.cache/electron" >> $GITHUB_ENV
194 echo "ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder" >> $GITHUB_ENV 193 echo "ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder" >> $GITHUB_ENV
195 echo "MANUAL_REBUILD_ON_NIGHTLY=${{ github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]') }}" >> $GITHUB_ENV 194 echo "MANUAL_REBUILD_ON_NIGHTLY=${{ github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]') }}" >> $GITHUB_ENV
196 echo "SKIP_NOTARIZATION=${{ !contains(github.repository_owner, 'ferdium') }}" >> $GITHUB_ENV
197 - name: Checkout code along with submodules for the 'nightly' branch if the trigger event is 'scheduled' or this is a forced rebuild on the nightly branch 195 - name: Checkout code along with submodules for the 'nightly' branch if the trigger event is 'scheduled' or this is a forced rebuild on the nightly branch
198 uses: actions/checkout@v2 196 uses: actions/checkout@v2
199 if: ${{ github.event_name == 'schedule' || env.MANUAL_REBUILD_ON_NIGHTLY == 'true' }} 197 if: ${{ github.event_name == 'schedule' || env.MANUAL_REBUILD_ON_NIGHTLY == 'true' }}
@@ -294,7 +292,6 @@ jobs:
294 run: | 292 run: |
295 echo "HOME=$USERPROFILE" >> $GITHUB_ENV 293 echo "HOME=$USERPROFILE" >> $GITHUB_ENV
296 echo "MANUAL_REBUILD_ON_NIGHTLY=${{ github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]') }}" >> $GITHUB_ENV 294 echo "MANUAL_REBUILD_ON_NIGHTLY=${{ github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]') }}" >> $GITHUB_ENV
297 echo "SKIP_NOTARIZATION=${{ !contains(github.repository_owner, 'ferdium') }}" >> $GITHUB_ENV
298 shell: bash 295 shell: bash
299 - name: Checkout code along with submodules for the 'nightly' branch if the trigger event is 'scheduled' or this is a forced rebuild on the nightly branch 296 - name: Checkout code along with submodules for the 'nightly' branch if the trigger event is 'scheduled' or this is a forced rebuild on the nightly branch
300 uses: actions/checkout@v2 297 uses: actions/checkout@v2
diff --git a/build-helpers/notarize.js b/build-helpers/notarize.js
index eaef75e19..bbd81c7b6 100644
--- a/build-helpers/notarize.js
+++ b/build-helpers/notarize.js
@@ -1,6 +1,6 @@
1exports.default = async function notarizing(context) { 1exports.default = async function notarizing(context) {
2 const { electronPlatformName, appOutDir } = context; 2 const { electronPlatformName, appOutDir } = context;
3 if (electronPlatformName !== 'darwin' || process.env.SKIP_NOTARIZATION === 'true' || (process.env.GIT_BRANCH_NAME !== 'release' && process.env.GIT_BRANCH_NAME !== 'nightly')) { 3 if (electronPlatformName !== 'darwin' || process.env.CSC_IDENTITY_AUTO_DISCOVERY === 'false' || (process.env.GIT_BRANCH_NAME !== 'release' && process.env.GIT_BRANCH_NAME !== 'nightly')) {
4 return; 4 return;
5 } 5 }
6 6