File tree 5 files changed +29
-4
lines changed
5 files changed +29
-4
lines changed Original file line number Diff line number Diff line change @@ -22,6 +22,10 @@ buildlet-stage0.windows-amd64: FORCE
22
22
go install golang.org/x/build/cmd/upload
23
23
upload --verbose --osarch=$@ --file=go:golang.org/x/build/cmd/buildlet/stage0 --public --cacheable=false go-builder-data/$@
24
24
25
+ buildlet-stage0.windows-arm64 : FORCE
26
+ go install golang.org/x/build/cmd/upload
27
+ upload --verbose --osarch=$@ --file=go:golang.org/x/build/cmd/buildlet/stage0 --public --cacheable=false go-builder-data/$@
28
+
25
29
buildlet-stage0.linux-arm : FORCE
26
30
go install golang.org/x/build/cmd/upload
27
31
upload --verbose --osarch=$@ --file=go:golang.org/x/build/cmd/buildlet/stage0 --public --cacheable=false go-builder-data/$@
Original file line number Diff line number Diff line change @@ -202,7 +202,7 @@ Download:
202
202
cmd .Args = append (cmd .Args , reverseHostTypeArgs (hostType )... )
203
203
case "windows/arm64" :
204
204
switch buildEnv {
205
- case "host-windows-arm64-mini" :
205
+ case "host-windows-arm64-mini" , "host-windows11-arm64-mini" :
206
206
cmd .Args = append (cmd .Args ,
207
207
"--halt=true" ,
208
208
"--reverse-type=" + buildEnv ,
Original file line number Diff line number Diff line change @@ -539,7 +539,14 @@ var Hosts = map[string]*HostConfig{
539
539
buildletURLTmpl : "http://storage.googleapis.com/$BUCKET/buildlet.windows-arm64" ,
540
540
goBootstrapURLTmpl : "https://storage.googleapis.com/$BUCKET/gobootstrap-windows-arm64-f22ec5.tar.gz" ,
541
541
IsReverse : true ,
542
- ExpectNum : 7 ,
542
+ ExpectNum : 6 ,
543
+ },
544
+ "host-windows11-arm64-mini" : & HostConfig {
545
+ Notes : "macOS hosting Windows 11 in qemu with HVM acceleration." ,
546
+ buildletURLTmpl : "http://storage.googleapis.com/$BUCKET/buildlet.windows-arm64" ,
547
+ goBootstrapURLTmpl : "https://storage.googleapis.com/$BUCKET/gobootstrap-windows-arm64-f22ec5.tar.gz" ,
548
+ IsReverse : true ,
549
+ ExpectNum : 1 ,
543
550
},
544
551
"host-darwin-10_12" : & HostConfig {
545
552
IsReverse : true ,
@@ -2475,6 +2482,17 @@ func init() {
2475
2482
"GOARCH=arm64" ,
2476
2483
},
2477
2484
})
2485
+ addBuilder (BuildConfig {
2486
+ Name : "windows-arm64-11" ,
2487
+ HostType : "host-windows11-arm64-mini" ,
2488
+ numTryTestHelpers : 1 ,
2489
+ buildsRepo : func (repo , branch , goBranch string ) bool {
2490
+ return atLeastGo1 (goBranch , 18 ) && buildRepoByDefault (repo )
2491
+ },
2492
+ env : []string {
2493
+ "GOARCH=arm64" ,
2494
+ },
2495
+ })
2478
2496
addBuilder (BuildConfig {
2479
2497
Name : "darwin-amd64-10_12" ,
2480
2498
HostType : "host-darwin-10_12" ,
Original file line number Diff line number Diff line change @@ -13,7 +13,7 @@ a1.metal instances then saving the image manually.
13
13
- Convert vhdx images to qcow2 via the following command:
14
14
15
15
``` shell
16
- qemu-image convert -O qcow2 win.vhdx win.qcow2
16
+ qemu-img convert -O qcow2 win.vhdx win.qcow2
17
17
```
18
18
19
19
- SSH to your instance tunneling port 5903, and run ` win10-arm64.sh`
@@ -29,6 +29,9 @@ a1.metal instances then saving the image manually.
29
29
- Alternatively, you can modify ` win10-arm64.sh` to forward ssh
30
30
access to the VM, and run PowerShell in the CLI, which is a bit
31
31
easier than through VNC.
32
+ - Verify autologin works after a reboot. If not, try
33
+ https://docs.microsoft.com/en-us/sysinternals/downloads/autologon.
34
+ - Set GO_BUILDER_ENV and install a builder key.
32
35
- Once the image is complete, download the image to your workstation
33
36
and upload to ` s3://go-builder-data` .
34
37
- You can find the appropriate the S3 path referenced in
Original file line number Diff line number Diff line change @@ -135,7 +135,7 @@ $vs_buildtools = "$builder_dir\vs_buildtools.exe"
135
135
Get-FileFromUrl - URL " https://aka.ms/vs/16/release/vs_buildtools.exe" - Output " $vs_buildtools "
136
136
137
137
Write-Host " installing Visual Studio Build Tools"
138
- & $vs_buildtools -- quiet -- wait -- norestart -- nocache -- installPath " $dep_dir \vs" -- all -- add Microsoft.VisualStudio.Component.VC.Tools.ARM64
138
+ & $vs_buildtools -- quiet -- wait -- norestart -- nocache -- installPath " $dep_dir \vs" -- all -- add Microsoft.VisualStudio.Component.VC.Tools.ARM64 -- add Microsoft.VisualStudio.Component.VC.Tools.ARM
139
139
140
140
# Create a buildlet user
141
141
Write-Host " creating buildlet user"
You can’t perform that action at this time.
0 commit comments