From 4ca1a77e321c48078a0060ac116db4e755dff417 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Tue, 19 Oct 2021 19:30:02 -0700
Subject: Import vsdevcmd environment variables if missing during build

---
 .github/workflows/build.yml | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e8246f03..e1ac1bd9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,17 +24,13 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Setup dotnet
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '5.0.x'
-
-      - name: Add MSBuild to PATH
-        uses: microsoft/setup-msbuild@v1.0.3
-
       - name: Build wix4
         shell: cmd
-        run: ./build.cmd
+        run: ./src/build_official.cmd
+        env:
+          RuntimeTestsEnabled: ${{ github.ref == 'refs/heads/master' }}
+          SigningUser:  ${{ github.ref == 'refs/heads/master' && secrets.WIX_SIGNING_USER || '' }}
+          SigningSecret:  ${{ github.ref == 'refs/heads/master' && secrets.WIX_SIGNING_SECRET || '' }}
 
       - name: Save build
         uses: actions/upload-artifact@v2
-- 
cgit v1.2.3-55-g6feb