aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-12-14 12:19:40 -0800
committerRob Mensching <rob@firegiant.com>2021-12-14 14:48:57 -0800
commit4dcbd404a65a836924509d14fc7febfd1227ec9b (patch)
treea52fac8c0f6acb2dda207eeb5fc91b5dcde51018
parent09aac160d5898d6b95cd1b43d2c5a62e085e6a17 (diff)
downloadwix-4dcbd404a65a836924509d14fc7febfd1227ec9b.tar.gz
wix-4dcbd404a65a836924509d14fc7febfd1227ec9b.tar.bz2
wix-4dcbd404a65a836924509d14fc7febfd1227ec9b.zip
Only run RuntimeTests in the `develop` and `master` branches
-rw-r--r--.github/workflows/build.yml2
-rw-r--r--src/test/test.cmd4
2 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f38fb5d7..379a18b4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -32,7 +32,7 @@ jobs:
32 shell: cmd 32 shell: cmd
33 run: ./src/build_official.cmd 33 run: ./src/build_official.cmd
34 env: 34 env:
35 RuntimeTestsEnabled: ${{ github.ref == 'refs/heads/master' }} 35 RuntimeTestsEnabled: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop' }}
36 SigningUser: ${{ github.ref == 'refs/heads/master' && secrets.WIX_SIGNING_USER || '' }} 36 SigningUser: ${{ github.ref == 'refs/heads/master' && secrets.WIX_SIGNING_USER || '' }}
37 SigningSecret: ${{ github.ref == 'refs/heads/master' && secrets.WIX_SIGNING_SECRET || '' }} 37 SigningSecret: ${{ github.ref == 'refs/heads/master' && secrets.WIX_SIGNING_SECRET || '' }}
38 38
diff --git a/src/test/test.cmd b/src/test/test.cmd
index 44965457..45df99bc 100644
--- a/src/test/test.cmd
+++ b/src/test/test.cmd
@@ -7,8 +7,8 @@
7@if /i "%1"=="test" set RuntimeTestsEnabled=true 7@if /i "%1"=="test" set RuntimeTestsEnabled=true
8@if not "%1"=="" shift & goto parse_args 8@if not "%1"=="" shift & goto parse_args
9 9
10@if "%RuntimeTestsEnabled%"=="" echo Build integration tests %_C% 10@if not "%RuntimeTestsEnabled%"=="true" echo Build integration tests %_C%
11@if not "%RuntimeTestsEnabled%"=="" set _T=test&echo Run integration tests %_C% 11@if "%RuntimeTestsEnabled%"=="true" set _T=test&echo Run integration tests %_C%
12 12
13@call burn\test_burn.cmd %_C% %_T% 13@call burn\test_burn.cmd %_C% %_T%
14 14