Skip to content

Commit 22043ea

Browse files
scharlton2scharlton2
authored
Merge pull request #50 from scharlton2/vtk-9.1.0
Compiles with VTK 9.1.0
2 parents 65a60ac + 70ada41 commit 22043ea

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1735
-290
lines changed

‎.gitattributes

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
misc/0001-update-for-memory-leaks.patch text eol=lf
1+
misc/0001-update-for-memory-leaks.patch text eol=lf
2+
*.ipynb text eol=lf

‎.github/workflows/build-vtk-leaks.yml

+54
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,33 @@ jobs:
2525

2626
- uses: actions/checkout@v2
2727

28+
- name: Install vs2017 build tools
29+
shell: pwsh
30+
run: |
31+
$downloaded = $false
32+
while (-Not $downloaded) {
33+
try {
34+
Invoke-WebRequest "https://aka.ms/vs/15/release/vs_buildtools.exe" -OutFile "$env:TEMP\vs_buildtools.exe" -UseBasicParsing
35+
$downloaded = $true
36+
}
37+
catch {
38+
Write-Output "Retry"
39+
}
40+
}
41+
$arg = @(
42+
"--add", "Microsoft.VisualStudio.Workload.VCTools", `
43+
"--add", "Microsoft.VisualStudio.Workload.MSBuildTools", `
44+
"--add", "Microsoft.VisualStudio.Component.VC.ATL", `
45+
"--add", "Microsoft.VisualStudio.Component.VC.ATLMFC", `
46+
"--includeRecommended", `
47+
"--passive", `
48+
"--wait", `
49+
"--norestart", `
50+
"--noUpdateInstaller"
51+
)
52+
$process = Start-Process -FilePath $env:TEMP\vs_buildtools.exe -ArgumentList $arg -Wait -PassThru
53+
Write-Output $process.ExitCode
54+
2855
- name: Export env
2956
env:
3057
type: debug
@@ -123,6 +150,33 @@ jobs:
123150

124151
- uses: actions/checkout@v2
125152

153+
- name: Install vs2017 build tools
154+
shell: pwsh
155+
run: |
156+
$downloaded = $false
157+
while (-Not $downloaded) {
158+
try {
159+
Invoke-WebRequest "https://aka.ms/vs/15/release/vs_buildtools.exe" -OutFile "$env:TEMP\vs_buildtools.exe" -UseBasicParsing
160+
$downloaded = $true
161+
}
162+
catch {
163+
Write-Output "Retry"
164+
}
165+
}
166+
$arg = @(
167+
"--add", "Microsoft.VisualStudio.Workload.VCTools", `
168+
"--add", "Microsoft.VisualStudio.Workload.MSBuildTools", `
169+
"--add", "Microsoft.VisualStudio.Component.VC.ATL", `
170+
"--add", "Microsoft.VisualStudio.Component.VC.ATLMFC", `
171+
"--includeRecommended", `
172+
"--passive", `
173+
"--wait", `
174+
"--norestart", `
175+
"--noUpdateInstaller"
176+
)
177+
$process = Start-Process -FilePath $env:TEMP\vs_buildtools.exe -ArgumentList $arg -Wait -PassThru
178+
Write-Output $process.ExitCode
179+
126180
- name: Export env
127181
env:
128182
type: release

‎.github/workflows/build-vtk.yml

+54
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,33 @@ jobs:
2525

2626
- uses: actions/checkout@v2
2727

28+
- name: Install vs2017 build tools
29+
shell: pwsh
30+
run: |
31+
$downloaded = $false
32+
while (-Not $downloaded) {
33+
try {
34+
Invoke-WebRequest "https://aka.ms/vs/15/release/vs_buildtools.exe" -OutFile "$env:TEMP\vs_buildtools.exe" -UseBasicParsing
35+
$downloaded = $true
36+
}
37+
catch {
38+
Write-Output "Retry"
39+
}
40+
}
41+
$arg = @(
42+
"--add", "Microsoft.VisualStudio.Workload.VCTools", `
43+
"--add", "Microsoft.VisualStudio.Workload.MSBuildTools", `
44+
"--add", "Microsoft.VisualStudio.Component.VC.ATL", `
45+
"--add", "Microsoft.VisualStudio.Component.VC.ATLMFC", `
46+
"--includeRecommended", `
47+
"--passive", `
48+
"--wait", `
49+
"--norestart", `
50+
"--noUpdateInstaller"
51+
)
52+
$process = Start-Process -FilePath $env:TEMP\vs_buildtools.exe -ArgumentList $arg -Wait -PassThru
53+
Write-Output $process.ExitCode
54+
2855
- name: Export env
2956
env:
3057
type: debug
@@ -110,6 +137,33 @@ jobs:
110137

111138
- uses: actions/checkout@v2
112139

140+
- name: Install vs2017 build tools
141+
shell: pwsh
142+
run: |
143+
$downloaded = $false
144+
while (-Not $downloaded) {
145+
try {
146+
Invoke-WebRequest "https://aka.ms/vs/15/release/vs_buildtools.exe" -OutFile "$env:TEMP\vs_buildtools.exe" -UseBasicParsing
147+
$downloaded = $true
148+
}
149+
catch {
150+
Write-Output "Retry"
151+
}
152+
}
153+
$arg = @(
154+
"--add", "Microsoft.VisualStudio.Workload.VCTools", `
155+
"--add", "Microsoft.VisualStudio.Workload.MSBuildTools", `
156+
"--add", "Microsoft.VisualStudio.Component.VC.ATL", `
157+
"--add", "Microsoft.VisualStudio.Component.VC.ATLMFC", `
158+
"--includeRecommended", `
159+
"--passive", `
160+
"--wait", `
161+
"--norestart", `
162+
"--noUpdateInstaller"
163+
)
164+
$process = Start-Process -FilePath $env:TEMP\vs_buildtools.exe -ArgumentList $arg -Wait -PassThru
165+
Write-Output $process.ExitCode
166+
113167
- name: Export env
114168
env:
115169
type: release

0 commit comments

Comments
 (0)