Skip to content

Commit 225a45d

Browse files
committed
It's useless to use the output from setupmsbuild
1 parent 8b1a333 commit 225a45d

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

Diff for: .github/workflows/publish-go-nightly-task.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -184,18 +184,15 @@ jobs:
184184
path: ${{ env.DIST_DIR }}
185185

186186
- name: Prepare PATH
187-
id: setupmsbuild
188187
uses: microsoft/setup-msbuild@v1
189188

190189
- name: Build MSI
191190
id: buildmsi
192-
env:
193-
MSBUILD_PATH: ${{ steps.setupmsbuild.outputs.msbuildPath }}
194191
run: |
195192
WIX_TAG="0.0.0" # use 0.0.0 as version for the installer since wix is picky about other alternatives, this only affects nightly builds (error CNDL0242)
196193
PACKAGE_FILENAME="${{ env.PROJECT_NAME }}_${TAG}_Windows_64bit"
197194
SOURCE_DIR="${GITHUB_WORKSPACE}/${{ env.DIST_DIR }}/${{ env.PROJECT_NAME }}_windows_amd64/"
198-
"${{ env.MSBUILD_PATH }}\MSBuild.exe" ./installer/cli.wixproj -p:SourceDir="$SOURCE_DIR" -p:OutputPath="${GITHUB_WORKSPACE}/${{ env.DIST_DIR }}" -p:OutputName="$PACKAGE_FILENAME" -p:ProductVersion="$WIX_TAG"
195+
MSBuild.exe ./installer/cli.wixproj -p:SourceDir="$SOURCE_DIR" -p:OutputPath="${GITHUB_WORKSPACE}/${{ env.DIST_DIR }}" -p:OutputName="$PACKAGE_FILENAME" -p:ProductVersion="$WIX_TAG"
199196
200197
- name: Save Win signing certificate to file
201198
run: echo "${{ secrets.INSTALLER_CERT_WINDOWS_PFX }}" | base64 --decode > ${{ env.INSTALLER_CERT_WINDOWS_PFX}}

Diff for: .github/workflows/release-go-task.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -191,19 +191,16 @@ jobs:
191191
path: ${{ env.DIST_DIR }}
192192

193193
- name: Prepare PATH
194-
id: setupmsbuild
195194
uses: microsoft/setup-msbuild@v1
196195

197196
- name: Build MSI
198197
id: buildmsi
199-
env:
200-
MSBUILD_PATH: ${{ steps.setupmsbuild.outputs.msbuildPath }}
201198
run: |
202199
TAG="${GITHUB_REF/refs\/tags\//}"
203200
WIX_TAG="${TAG%%-*}" # removes "-rc*" since wix is not happy with it, this only affects RCs builds (error CNDL0108)
204201
PACKAGE_FILENAME="${{ env.PROJECT_NAME }}_${TAG}_Windows_64bit"
205202
SOURCE_DIR="${GITHUB_WORKSPACE}/${{ env.DIST_DIR }}/${{ env.PROJECT_NAME }}_windows_amd64/"
206-
"${{ env.MSBUILD_PATH }}\MSBuild.exe" ./installer/cli.wixproj -p:SourceDir="$SOURCE_DIR" -p:OutputPath="${GITHUB_WORKSPACE}/${{ env.DIST_DIR }}" -p:OutputName="$PACKAGE_FILENAME" -p:ProductVersion="$WIX_TAG"
203+
MSBuild.exe ./installer/cli.wixproj -p:SourceDir="$SOURCE_DIR" -p:OutputPath="${GITHUB_WORKSPACE}/${{ env.DIST_DIR }}" -p:OutputName="$PACKAGE_FILENAME" -p:ProductVersion="$WIX_TAG"
207204
208205
- name: Save Win signing certificate to file
209206
run: echo "${{ secrets.INSTALLER_CERT_WINDOWS_PFX }}" | base64 --decode > ${{ env.INSTALLER_CERT_WINDOWS_PFX}}

0 commit comments

Comments
 (0)