Skip to content

Commit 5b4c598

Browse files
jkennedyvzJohn Kennedy
andauthored
Improving Build Readability (#78)
These changes improve the readability of signing conditions in the build process. Co-authored-by: John Kennedy <jkennedy@verizonmedia.com>
1 parent 0c6cda5 commit 5b4c598

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

.github/workflows/ci.yaml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,11 @@ jobs:
4040
submodules: true
4141

4242
- name: Build PR (mac)
43-
if: matrix.os == 'macos-latest' && !contains(github.ref, 'tags/v') && !contains(github.ref, 'refs/heads/master') && !contains(github.ref, 'refs/heads/release-')
43+
if: |
44+
matrix.os == 'macos-latest' &&
45+
contains(github.ref, 'tags/v') != true &&
46+
contains(github.ref, 'refs/heads/master') != true &&
47+
contains(github.ref, 'refs/heads/release') != true
4448
run: |
4549
brew install qt@5
4650
export PATH="/usr/local/opt/qt@5/bin:$PATH"
@@ -54,14 +58,18 @@ jobs:
5458
cp README.md dist/README.md
5559
5660
- name: Import Code-Signing Certificates
57-
if: matrix.os == 'macos-latest' && (contains(github.ref, 'tags/v') || contains(github.ref, 'refs/heads/master') || contains(github.ref, 'refs/heads/release-'))
61+
if: |
62+
matrix.os == 'macos-latest' &&
63+
(contains(github.ref, 'tags/v') || github.ref == 'refs/heads/master' || contains(github.ref, 'refs/heads/release'))
5864
uses: Apple-Actions/import-codesign-certs@v1
5965
with:
6066
p12-file-base64: ${{ secrets.MACOS_CERT }}
6167
p12-password: ${{ secrets.MACOS_PASS }}
6268

6369
- name: Build and Sign Release (mac)
64-
if: matrix.os == 'macos-latest' && (contains(github.ref, 'tags/v') || contains(github.ref, 'refs/heads/master') || contains(github.ref, 'refs/heads/release-'))
70+
if: |
71+
matrix.os == 'macos-latest' &&
72+
(contains(github.ref, 'tags/v') || github.ref == 'refs/heads/master' || contains(github.ref, 'refs/heads/release'))
6573
run: |
6674
brew install qt
6775
export PATH="/usr/local/opt/qt/bin:$PATH"
@@ -74,8 +82,10 @@ jobs:
7482
cp LICENSE dist/LICENSE
7583
cp README.md dist/README.md
7684
77-
- name: Install gon via HomeBrew and Notarize Release (mac)
78-
if: matrix.os == 'macos-latest' && (contains(github.ref, 'tags/v') || contains(github.ref, 'refs/heads/master') || contains(github.ref, 'refs/heads/release-'))
85+
- name: Install gon via HomeBrew and Notarize (mac)
86+
if: |
87+
matrix.os == 'macos-latest' &&
88+
(contains(github.ref, 'tags/v') || github.ref == 'refs/heads/master' || contains(github.ref, 'refs/heads/release'))
7989
env:
8090
GON_CONF: ${{ secrets.GON_CONF }}
8191
run: |

0 commit comments

Comments
 (0)