Skip to content

Commit ff70380

Browse files
sweco-sedahdsweco-sedahd
committed
Updated build script
1 parent 3bd9cdc commit ff70380

1 file changed

Lines changed: 21 additions & 30 deletions

File tree

‎.github/workflows/msbuild.yml‎

Lines changed: 21 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,11 @@ env:
2424
jobs:
2525
build:
2626
name: Build MapWinGIS
27-
runs-on: windows-2019
27+
runs-on: windows-2022
2828

2929
strategy:
3030
matrix:
31-
platform: ['Win32', 'x64']
32-
# platform: ['Win32']
31+
platform: ['x64']
3332

3433
steps:
3534
- uses: actions/checkout@v3
@@ -96,32 +95,30 @@ jobs:
9695
with:
9796
# Specify the Az PowerShell script here.
9897
inlineScript: |
99-
Invoke-WebRequest -Uri "https://github.com/MapWindow/Dependencies/raw/main/GisInternals/release-1928-gdal-3-5-mapserver-8-0.zip" -MaximumRetryCount 3 -Resume -RetryIntervalSec 30 -OutFile ".\Support\release-1928-gdal-3-5-mapserver-8-0.zip"
100-
Invoke-WebRequest -Uri "https://github.com/MapWindow/Dependencies/raw/main/GisInternals/release-1928-gdal-3-5-mapserver-8-0-libs.zip" -MaximumRetryCount 3 -Resume -RetryIntervalSec 30 -OutFile ".\Support\release-1928-gdal-3-5-mapserver-8-0-libs.zip"
101-
Invoke-WebRequest -Uri "https://github.com/MapWindow/Dependencies/raw/main/GisInternals/release-1928-x64-gdal-3-5-mapserver-8-0.zip" -MaximumRetryCount 3 -Resume -RetryIntervalSec 30 -OutFile ".\Support\release-1928-x64-gdal-3-5-mapserver-8-0.zip"
102-
Invoke-WebRequest -Uri "https://github.com/MapWindow/Dependencies/raw/main/GisInternals/release-1928-x64-gdal-3-5-mapserver-8-0-libs.zip" -MaximumRetryCount 3 -Resume -RetryIntervalSec 30 -OutFile ".\Support\release-1928-x64-gdal-3-5-mapserver-8-0-libs.zip"
98+
Invoke-WebRequest -Uri "https://github.com/sweco-sedahd/Dependencies/blob/main/GisInternals/release-1930-x64-gdal-3-10-3-mapserver-8-2-2.zip" -MaximumRetryCount 3 -Resume -RetryIntervalSec 30 -OutFile ".\Support\release-1930-x64-gdal-3-10-3-mapserver-8-2-2.zip"
99+
Invoke-WebRequest -Uri "https://github.com/sweco-sedahd/Dependencies/blob/main/GisInternals/release-1930-x64-gdal-3-10-3-mapserver-8-2-2-libs.zip" -MaximumRetryCount 3 -Resume -RetryIntervalSec 30 -OutFile ".\Support\release-1930-x64-gdal-3-10-3-mapserver-8-2-2-libs.zip"
103100
ls .\Support\
104101
# Azure PS version to be used to execute the script, example: 1.8.0, 2.8.0, 3.4.0. To use the latest version, specify "latest".
105102
azPSVersion: "latest"
106103
# Select the value of the ErrorActionPreference variable for executing the script. Options: stop, continue, silentlyContinue. Default is Stop.
107104
errorActionPreference: Stop
108105
# If this is true, this task will fail if any errors are written to the error pipeline, or if any data is written to the Standard Error stream.
109106
failOnStandardError: true
110-
107+
111108
# Unzip zips by calling powershell script
112109
- name: Unzip
113110
working-directory: ./Support/
114111
shell: pwsh
115-
run: .\unpackGdal3-Toolset142-GISInternals.ps1
116-
112+
run: .\unpackGdal3-Toolset143-GISInternals.ps1
113+
117114
# Build support libs
118115
- name: Build SupportLibs ${{matrix.platform}}
119116
working-directory: ${{env.GITHUB_WORKSPACE}}
120117
# Add additional options to the MSBuild command line here (like platform or verbosity level).
121118
# See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
122119
# MSBuild SupportLibs.sln /t:Rebuild /p:Configuration=Release /p:Platform="Win32"
123120
run: msbuild /m /p:Configuration=Release /p:Platform=${{matrix.platform}} ${{env.SUPPORTLIBS_SOLUTION_FILE_PATH}}
124-
121+
125122
# Build MapWinGIS
126123
- name: Build MapWinGIS ${{matrix.platform}}
127124
working-directory: ${{env.GITHUB_WORKSPACE}}
@@ -145,21 +142,15 @@ jobs:
145142
strategy:
146143
max-parallel: 1
147144
matrix:
148-
platform: ['x64', 'Win32']
149-
# platform: ['Win32']
150-
145+
platform: ['x64']
146+
151147
steps:
152148
- uses: actions/checkout@v3
153-
154-
- name: Setup dotnet 6
155-
uses: actions/setup-dotnet@v1
156-
with:
157-
dotnet-version: '6.x'
158149

159-
- name: Setup dotnet 7
150+
- name: Setup dotnet 8
160151
uses: actions/setup-dotnet@v1
161152
with:
162-
dotnet-version: '6.x'
153+
dotnet-version: '8.x'
163154

164155
- name: Download MapWinGIS (${{matrix.platform}}) binaries
165156
uses: actions/download-artifact@v2
@@ -179,9 +170,9 @@ jobs:
179170
3 = "FAIL_LOAD - LoadLibrary Failed";
180171
4 = "FAIL_ENTRY - GetProcAddress failed";
181172
5 = "FAIL_REG - DllRegisterServer or DllUnregisterServer failed.";
182-
}
183-
$regsvrp = Start-Process C:\Windows\SysWOW64\regsvr32.exe -ArgumentList "/s ${{ github.workspace }}\src\bin\${{env.BUILD_CONFIGURATION}}\${{matrix.platform}}\MapWinGIS.ocx" -PassThru
184-
173+
}
174+
$regsvrp = Start-Process C:\Windows\System32\regsvr32.exe -ArgumentList "/s ${{ github.workspace }}\src\bin\${{env.BUILD_CONFIGURATION}}\${{matrix.platform}}\MapWinGIS.ocx" -PassThru
175+
185176
$regsvrp.WaitForExit(5000) # Wait (up to) 5 seconds
186177
if($regsvrp.ExitCode -ne 0)
187178
{
@@ -197,32 +188,32 @@ jobs:
197188

198189
# Build test solution
199190
- name: setup-msbuild
200-
uses: microsoft/setup-msbuild@v1.1
191+
uses: microsoft/setup-msbuild@v1.1
201192
if: ${{matrix.platform == 'x64' }}
202193
with:
203194
msbuild-architecture: x64
204195
- name: setup-msbuild
205-
uses: microsoft/setup-msbuild@v1.1
196+
uses: microsoft/setup-msbuild@v1.1
206197
if: ${{matrix.platform == 'Win32' }}
207198
with:
208199
msbuild-architecture: x86
209-
200+
210201
- name: Build test solution ${{matrix.platform}}
211202
working-directory: ${{env.GITHUB_WORKSPACE}}
212203
# Add additional options to the MSBuild command line here (like platform or verbosity level).
213204
# See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
214205
# MSBuild SupportLibs.sln /t:Rebuild /p:Configuration=Release /p:Platform="Win32"
215-
run: msbuild /m:2 /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform=${{matrix.platform}} -restore /v:m ${{env.UNITTESTS_SOLUTION_FILE_PATH}}
206+
run: msbuild /m:2 /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform=${{matrix.platform}} -restore /v:m ${{env.UNITTESTS_SOLUTION_FILE_PATH}}
216207

217208
# Run unit tests
218209
- name: Setup VSTest.console.exe
219210
uses: darenm/Setup-VSTest@v1
220211
- name: Unit Testing x86
221212
if: ${{matrix.platform == 'Win32' }}
222-
run: vstest.console.exe /Blame /Diag:logs\log.txt /Platform:x86 -e:PROJ_LIB="${{ github.workspace }}\src\bin\${{env.BUILD_CONFIGURATION}}\Win32\proj7\share\" .\MapWinGisTests-net6\MapWinGisTests\bin\x86\${{env.BUILD_CONFIGURATION}}\net6.0-windows8.0\MapWinGisTests.dll
213+
run: vstest.console.exe /Blame /Diag:logs\log.txt /Platform:x86 -e:PROJ_LIB="${{ github.workspace }}\src\bin\${{env.BUILD_CONFIGURATION}}\Win32\proj9\share\" .\MapWinGisTests-net6\MapWinGisTests\bin\x86\${{env.BUILD_CONFIGURATION}}\net8.0-windows8.0\MapWinGisTests.dll
223214
- name: Unit Testing x64
224215
if: ${{matrix.platform == 'x64' }}
225-
run: vstest.console.exe /Blame /Diag:logs\log.txt /Platform:x64 -e:PROJ_LIB="${{ github.workspace }}\src\bin\${{env.BUILD_CONFIGURATION}}\x64\proj7\share\" .\MapWinGisTests-net6\MapWinGisTests\bin\x64\${{env.BUILD_CONFIGURATION}}\net6.0-windows8.0\MapWinGisTests.dll
216+
run: vstest.console.exe /Blame /Diag:logs\log.txt /Platform:x64 -e:PROJ_LIB="${{ github.workspace }}\src\bin\${{env.BUILD_CONFIGURATION}}\x64\proj9\share\" .\MapWinGisTests-net6\MapWinGisTests\bin\x64\${{env.BUILD_CONFIGURATION}}\net8.0-windows8.0\MapWinGisTests.dll
226217

227218
# TODO: Create installer using innosetup
228219
# TODO: Publish installer to GitHub Releases

0 commit comments

Comments
 (0)