Skip to content

Commit b9aed4e

Browse files
author
Ron de las Alas
committed
ci: Set signing var based on branch name [skip ci]
1 parent 5699bda commit b9aed4e

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

.github/workflows/ci-cd.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: CI/CD
2-
32
on:
43
push:
5-
workflow_dispatch:
64

75
concurrency:
86
group: '${{ github.workflow }} @ ${{ github.head_ref || github.ref }}'
@@ -27,9 +25,10 @@ jobs:
2725
environment:
2826
name: ${{ matrix.os }}
2927
env:
28+
SCRATCH_SHOULD_SIGN: ${{ github.ref_name == 'main' }}
3029
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
31-
AC_USERNAME: ${{ secrets.AC_USERNAME }}
32-
AC_PASSWORD: ${{ secrets.AC_PASSWORD }}
30+
AC_USERNAME: ${{ github.ref_name == 'main' && secrets.AC_USERNAME }}
31+
AC_PASSWORD: ${{ github.ref_name == 'main' && secrets.AC_PASSWORD }}
3332
steps:
3433
- uses: actions/checkout@v3
3534
- uses: actions/setup-node@v3
@@ -60,7 +59,7 @@ jobs:
6059
with:
6160
ssh-private-key: ${{ secrets.FASTLANE_DEPLOY_KEY }}
6261
- name: Fastlane
63-
if: matrix.os == 'macos-latest' && vars.SCRATCH_SHOULD_SIGN
62+
if: matrix.os == 'macos-latest' && env.SCRATCH_SHOULD_SIGN == true
6463
run: fastlane circleci
6564
- name: Build
6665
timeout-minutes: 30 # macOS notarization can take a while
@@ -71,10 +70,10 @@ jobs:
7170
# macOS CSC info was set by Fastlane above
7271
WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }}
7372
WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }}
74-
PYTHON_PATH: /Users/runner/.pyenv/versions/2.7.18/bin/python
75-
run: npm run ${{ vars.SCRATCH_SHOULD_SIGN && 'dist' || 'distDev' }}
73+
PYTHON_PATH: ${{ matrix.os == 'macos-latest' && '/Users/runner/.pyenv/versions/2.7.18/bin/python'}}
74+
run: npm run ${{ env.SCRATCH_SHOULD_SIGN == true && 'dist' || 'distDev' }}
7675
- name: Zip MAS-Dev build
77-
if: matrix.os == 'macos-latest'
76+
if: matrix.os == 'macos-latest' && env.SCRATCH_SHOULD_SIGN == true
7877
run: |
7978
NPM_APP_VERSION="`node -pe "require('./package.json').version"`"
8079
cd dist/mas-dev

0 commit comments

Comments
 (0)