Skip to content

Commit ffab841

Browse files
sdarwinsdarwin
committed
Add llvm component in Visual Studio
1 parent b291ad1 commit ffab841

File tree

6 files changed

+67
-8
lines changed

6 files changed

+67
-8
lines changed

‎examples/multi-runner-cppal/templates/runner-configs/windows-2022.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ runner_config:
2424
scale_down_schedule_expression: cron(* * * * ? *)
2525
runner_boot_time_in_minutes: 20
2626
ami_owners: [ "047402373783" ]
27-
ami_filter: { 'name': ['github-runner-windows-2022-amd64-202308171527'] }
27+
ami_filter: { 'name': ['github-runner-windows-2022-amd64-202312181755'] }
2828
block_device_mappings:
2929
- device_name: /dev/sda1
3030
delete_on_termination: true
3131
volume_type: gp3
32-
volume_size: 60
32+
volume_size: 70
3333
encrypted: true
3434
iops: null
3535
throughput: null

‎images/windows-2022-cppal/manifest.json

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,52 @@
6262
"artifact_id": "us-west-2:ami-0c09b40136606c789",
6363
"packer_run_uuid": "d6ce02cd-07e0-eddb-6060-11ac94116742",
6464
"custom_data": null
65+
},
66+
{
67+
"name": "githubrunner",
68+
"builder_type": "amazon-ebs",
69+
"build_time": 1702682799,
70+
"files": null,
71+
"artifact_id": "us-west-2:ami-0927ba164cbc67862",
72+
"packer_run_uuid": "ec863841-1dd5-c0c1-20db-789c7fa5d7d7",
73+
"custom_data": null
74+
},
75+
{
76+
"name": "githubrunner",
77+
"builder_type": "amazon-ebs",
78+
"build_time": 1702688362,
79+
"files": null,
80+
"artifact_id": "us-west-2:ami-09944338a248c5b89",
81+
"packer_run_uuid": "362ad4a2-1cc9-b68e-6d16-a0600354af21",
82+
"custom_data": null
83+
},
84+
{
85+
"name": "githubrunner",
86+
"builder_type": "amazon-ebs",
87+
"build_time": 1702694327,
88+
"files": null,
89+
"artifact_id": "us-west-2:ami-0634124047903c1ed",
90+
"packer_run_uuid": "86e883d5-ac94-4a1c-0e99-d3a4e67efc21",
91+
"custom_data": null
92+
},
93+
{
94+
"name": "githubrunner",
95+
"builder_type": "amazon-ebs",
96+
"build_time": 1702917867,
97+
"files": null,
98+
"artifact_id": "us-west-2:ami-00ec5f9bb8f5a19fa",
99+
"packer_run_uuid": "aea9befb-74da-cbdd-61f7-a609469af538",
100+
"custom_data": null
101+
},
102+
{
103+
"name": "githubrunner",
104+
"builder_type": "amazon-ebs",
105+
"build_time": 1702925586,
106+
"files": null,
107+
"artifact_id": "us-west-2:ami-01fb6887bb9bcf622",
108+
"packer_run_uuid": "c9a6bdbc-1801-c4be-5c2c-6e3093a92e9c",
109+
"custom_data": null
65110
}
66111
],
67-
"last_run_uuid": "d6ce02cd-07e0-eddb-6060-11ac94116742"
112+
"last_run_uuid": "c9a6bdbc-1801-c4be-5c2c-6e3093a92e9c"
68113
}

‎images/windows-2022-cppal/variables.auto.pkrvars.hcl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# packer build . | tee output.out 2>&1
77
region = "us-west-2"
88
instance_type = "t2.xlarge"
9-
root_volume_size_gb = 60
9+
root_volume_size_gb = 70
1010
ssh_keypair_name = "cppalliance-us-west-2-kp"
1111
ssh_private_key_file = "/root/.ssh/cppalliance-us-west-2-kp.pem"
1212

@@ -22,7 +22,7 @@ custom_shell_commands = [
2222
"# with visualstudio2022buildtools and visualstudio2019-workload-vctools. Warnings and errors. Commenting out:",
2323
"# choco install -y visualstudio2019buildtools",
2424
"# choco install visualstudio2019-workload-vctools --package-parameters \"--add Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64\" \"--add Microsoft.VisualStudio.Component.VC.v141.x86.x64\" \"--add Microsoft.VisualStudio.Component.VC.140\" -y ",
25-
"choco install -y visualstudio2022buildtools --version 117.6.5.0",
25+
"choco install -y visualstudio2022buildtools --parameters \"--add Microsoft.VisualStudio.Component.VC.Llvm.Clang --add Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset --add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang --add Microsoft.VisualStudio.Component.VC.CMake.Project\"",
2626
"choco install -y 7zip.install --version 22.1",
2727
"# automatic",
2828
"# choco install -y chocolatey --version 1.31",
@@ -33,7 +33,7 @@ custom_shell_commands = [
3333
"# choco install -y chocolatey-visualstudio.extension --version 1.10.2",
3434
"# choco install -y chocolatey-windowsupdate.extension --version 1.0.5",
3535
"# cmake not in path without extra flag",
36-
"choco install -y cmake.install --installargs '\"ADD_CMAKE_TO_PATH=System\"' --version 3.26.3",
36+
"choco install -y cmake.install --installargs '\"ADD_CMAKE_TO_PATH=System\"' --version 3.27.9",
3737
"choco install -y curl --version 8.0.1",
3838
"# choco install -y DotNet4.5.2 ",
3939
"# choco install -y DotNet4.6 ",
@@ -80,6 +80,7 @@ custom_shell_commands = [
8080
"echo Adding visualstudio2022",
8181
"# visualstudio2022-workload-vctools failed last time. Add a sleep command.",
8282
"Start-Sleep -Seconds 10",
83+
" # This should be rewritten with fewer quotes, group all together.",
8384
"choco upgrade visualstudio2022-workload-vctools --package-parameters \"--add Microsoft.VisualStudio.Component.VC.14.34.17.4.x86.x64\" \"--add Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64\" \"--add Microsoft.VisualStudio.Component.VC.v141.x86.x64\" \"--add Microsoft.VisualStudio.Component.VC.140\" -y ",
8485
"$${oldpath} = (Get-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\\System\\CurrentControlSet\\Control\\Session Manager\\Environment' -Name PATH).path",
8586
"$${newpath} = \"C:\\Git\\usr\\bin;$${oldpath}\"",

‎scripts/packerimages.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ build_environment=prod
1818
# windows-2022-cppal
1919

2020
imagestobuild="
21-
windows-2019-cppal
21+
windows-2022-cppal
2222
"
2323

2424
if [ "$build_environment" = "dev" ]; then

‎scripts/prod_amis.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ all_amis[ubuntu-focal.yaml]=github-runner-ubuntu-focal-amd64-202308031506
1414
all_amis[ubuntu-jammy-arm64.yaml]=github-runner-ubuntu-jammy-arm64-202308031506
1515
all_amis[ubuntu-jammy.yaml]=github-runner-ubuntu-jammy-amd64-202308031506
1616
all_amis[windows-2019.yaml]=github-runner-windows-2019-amd64-202308172004
17-
all_amis[windows-2022.yaml]=github-runner-windows-2022-amd64-202308171527
17+
all_amis[windows-2022.yaml]=github-runner-windows-2022-amd64-202312181755
1818

1919
# Update the templates with the above values
2020

‎scripts/removeamis_part2.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,19 @@ test="
1010
"
1111

1212
amis="
13+
ami-0634124047903c1ed
14+
ami-0841a945303463903
15+
ami-09944338a248c5b89
16+
ami-0c7a489e7f048f53e
17+
ami-0668a7bad2329a87c
18+
ami-0426bd562cd051f30
19+
ami-00ec5f9bb8f5a19fa
20+
ami-0d3905ec987855806
21+
ami-029863b793a310918
22+
ami-0c09b40136606c789
23+
ami-07cb842ccc3adaecf
24+
ami-0927ba164cbc67862
25+
ami-01fa5982bda798944
1326
"
1427

1528
region=us-west-2

0 commit comments

Comments
 (0)