Skip to content

Commit 30c1bfe

Browse files
aartis17aartis17
authored
Merge branch 'actions:main' into macos-ruby-changes
2 parents 78fbd72 + b28a104 commit 30c1bfe

24 files changed

+230
-261
lines changed

‎helpers/GenerateResourcesAndImage.ps1‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ Function GenerateResourcesAndImage {
119119
The default is 'ask'.
120120
.PARAMETER Tags
121121
Tags to be applied to the Azure resources created.
122+
.PARAMETER PluginVersion
123+
Specify the version of the packer Azure plugin to use. The default is "2.2.1".
122124
.EXAMPLE
123125
GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "shsamytest1" -ImageGenerationRepositoryRoot "C:\runner-images" -ImageType Ubuntu2004 -AzureLocation "East US"
124126
#>
@@ -144,6 +146,8 @@ Function GenerateResourcesAndImage {
144146
[Parameter(Mandatory = $False)]
145147
[string] $AzureTenantId,
146148
[Parameter(Mandatory = $False)]
149+
[string] $PluginVersion = "2.2.1",
150+
[Parameter(Mandatory = $False)]
147151
[switch] $RestrictToAgentIpAddress,
148152
[Parameter(Mandatory = $False)]
149153
[switch] $Force,
@@ -218,7 +222,7 @@ Function GenerateResourcesAndImage {
218222
$InstallPassword = $env:UserName + [System.GUID]::NewGuid().ToString().ToUpper()
219223

220224
Write-Host "Downloading packer plugins..."
221-
& $PackerBinary init $TemplatePath
225+
& $PackerBinary plugins install github.com/hashicorp/azure $PluginVersion
222226

223227
if ($LastExitCode -ne 0) {
224228
throw "Packer plugins download failed."

‎images.CI/linux-and-win/build-image.ps1‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ param(
88
[String] [Parameter (Mandatory=$true)] $TempResourceGroupName,
99
[String] [Parameter (Mandatory=$true)] $SubscriptionId,
1010
[String] [Parameter (Mandatory=$true)] $TenantId,
11+
[String] [Parameter (Mandatory=$false)] $pluginVersion = "2.2.1",
1112
[String] [Parameter (Mandatory=$false)] $VirtualNetworkName,
1213
[String] [Parameter (Mandatory=$false)] $VirtualNetworkRG,
1314
[String] [Parameter (Mandatory=$false)] $VirtualNetworkSubnet,
@@ -40,7 +41,7 @@ Write-Host "Show Packer Version"
4041
packer --version
4142

4243
Write-Host "Download packer plugins"
43-
packer init $TemplatePath
44+
packer plugins install github.com/hashicorp/azure $pluginVersion
4445

4546
Write-Host "Validate packer template"
4647
packer validate -syntax-only $TemplatePath

‎images/ubuntu/Ubuntu2004-Readme.md‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Ubuntu 20.04
22
- OS Version: 20.04.6 LTS
33
- Kernel Version: 5.15.0-1078-azure
4-
- Image Version: 20250202.1.0
4+
- Image Version: 20250209.1.0
55
- Systemd version: 245.4-4ubuntu3.24
66

77
## Installed Software
@@ -29,15 +29,15 @@
2929
### Package Management
3030
- cpan 1.64
3131
- Helm 3.17.0
32-
- Homebrew 4.4.19
33-
- Miniconda 24.11.1
32+
- Homebrew 4.4.20
33+
- Miniconda 25.1.1
3434
- Npm 10.8.2
3535
- NuGet 6.6.1.2
3636
- Pip 20.0.2
3737
- Pip3 20.0.2
3838
- Pipx 1.7.1
3939
- RubyGems 3.1.2
40-
- Vcpkg (build from commit 0ca64b4e1)
40+
- Vcpkg (build from commit 74ec888e38)
4141
- Yarn 1.22.22
4242

4343
#### Environment variables
@@ -81,7 +81,7 @@ to accomplish this.
8181
- Git LFS 3.6.1
8282
- Git-ftp 1.6.0
8383
- Haveged 1.9.1
84-
- Heroku 10.0.2
84+
- Heroku 10.1.0
8585
- HHVM (HipHop VM) 4.172.1
8686
- jq 1.6
8787
- Kind 0.26.0
@@ -99,7 +99,7 @@ to accomplish this.
9999
- Parcel 2.13.3
100100
- PhantomJS 2.1.1 2.1.1
101101
- Podman 3.4.2
102-
- Pulumi 3.148.0
102+
- Pulumi 3.149.0
103103
- R 4.4.2
104104
- Skopeo 1.5.0
105105
- Sphinx Open Source Search Server 2.2.11
@@ -111,17 +111,17 @@ to accomplish this.
111111

112112
### CLI Tools
113113
- Alibaba Cloud CLI 3.0.174
114-
- AWS CLI 2.23.11
115-
- AWS CLI Session Manager Plugin 1.2.694.0
116-
- AWS SAM CLI 1.132.0
114+
- AWS CLI 2.24.0
115+
- AWS CLI Session Manager Plugin 1.2.707.0
116+
- AWS SAM CLI 1.133.0
117117
- Azure CLI 2.68.0
118118
- Azure CLI (azure-devops) 1.0.1
119119
- GitHub CLI 2.66.1
120-
- Google Cloud CLI 508.0.0
121-
- Netlify CLI 18.0.3
120+
- Google Cloud CLI 509.0.0
121+
- Netlify CLI 18.0.4
122122
- OpenShift CLI 4.15.19
123123
- ORAS CLI 1.2.2
124-
- Vercel CLI 40.1.0
124+
- Vercel CLI 41.0.2
125125

126126
### Java
127127
| Version | Environment Variable |
@@ -160,13 +160,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled.
160160
- Rustfmt 1.8.0
161161

162162
### Browsers and Drivers
163-
- Google Chrome 132.0.6834.159
164-
- ChromeDriver 132.0.6834.159
165-
- Chromium 132.0.6834.0
163+
- Google Chrome 133.0.6943.53
164+
- ChromeDriver 133.0.6943.53
165+
- Chromium 133.0.6943.0
166166
- Microsoft Edge 132.0.2957.140
167167
- Microsoft Edge WebDriver 132.0.2957.140
168168
- Selenium server 4.28.1
169-
- Mozilla Firefox 134.0.2
169+
- Mozilla Firefox 135.0
170170
- Geckodriver 0.35.0
171171

172172
#### Environment variables
@@ -210,8 +210,8 @@ Use the following command as a part of your job to start the service: 'sudo syst
210210

211211
#### Go
212212
- 1.21.13
213-
- 1.22.11
214-
- 1.23.5
213+
- 1.22.12
214+
- 1.23.6
215215

216216
#### Node.js
217217
- 18.20.6
@@ -223,21 +223,21 @@ Use the following command as a part of your job to start the service: 'sudo syst
223223
- 3.9.21
224224
- 3.10.16
225225
- 3.11.11
226-
- 3.12.8
227-
- 3.13.1
226+
- 3.12.9
227+
- 3.13.2
228228

229229
#### PyPy
230-
- 2.7.18 [PyPy 7.3.17]
230+
- 2.7.18 [PyPy 7.3.18]
231231
- 3.6.12 [PyPy 7.3.3]
232232
- 3.7.13 [PyPy 7.3.9]
233233
- 3.8.16 [PyPy 7.3.11]
234234
- 3.9.19 [PyPy 7.3.16]
235-
- 3.10.14 [PyPy 7.3.17]
235+
- 3.10.16 [PyPy 7.3.18]
236236

237237
#### Ruby
238238
- 3.0.7
239239
- 3.1.6
240-
- 3.2.6
240+
- 3.2.7
241241
- 3.3.7
242242

243243
### PowerShell Tools
@@ -262,6 +262,7 @@ Use the following command as a part of your job to start the service: 'sudo syst
262262
| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
263263
| Android Command Line Tools | 9.0 |
264264
| Android SDK Build-tools | 35.0.0 35.0.1<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 |
265+
| Android SDK Platform-Tools | 35.0.2 |
265266
| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) |
266267
| Android Support Repository | 47.0.0 |
267268
| CMake | 3.10.2<br>3.18.1<br>3.22.1 |
@@ -287,14 +288,14 @@ Use the following command as a part of your job to start the service: 'sudo syst
287288
| alpine:3.18 | sha256:dd60c75fba961ecc5e918961c713f3c42dd5665171c58f9b2ef5aafe081ad5a0 | 2025-01-08 |
288289
| alpine:3.19 | sha256:6380aa6b04faa579332d4c9d1f65bd7093012ba6e01d9bbcd5e2d8a4f9fae38f | 2025-01-08 |
289290
| debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 |
290-
| debian:11 | sha256:e5bfb7364038fd100c2faebdd674145bd1bc758a57f3c67023cced99d0eff0f7 | 2025-01-13 |
291+
| debian:11 | sha256:63904b1442dc0bb1e7a7a7065b3ba0d10d4e300f984115a40d371827fe4e3a85 | 2025-02-03 |
291292
| debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 |
292293
| moby/buildkit:latest | sha256:14aa1b4dd92ea0a4cd03a54d0c6079046ea98cd0c0ae6176bdd7036ba370cbbe | 2025-01-20 |
293-
| node:18 | sha256:720eeea325b3da50e108ba34dde0fd69feeb3c59485199c5e22b0ea49a792aa5 | 2025-01-22 |
294+
| node:18 | sha256:f12d34408955b2081f82078e8f96c3299ca0f38d11e76086cb9b9b1b669977e4 | 2025-01-22 |
294295
| node:18-alpine | sha256:974afb6cbc0314dc6502b14243b8a39fbb2d04d975e9059dd066be3e274fbb25 | 2025-01-22 |
295-
| node:20 | sha256:bc3d86568d9a9e062cdf7036367f6e2ce201925e2912758bcd3b0e2657875a63 | 2025-01-22 |
296+
| node:20 | sha256:3496cba96d3548fc484a7febc77edebffcae693aff6a067bc34ec6d8c1f7affe | 2025-01-22 |
296297
| node:20-alpine | sha256:2cd2a6f4cb37cf8a007d5f1e9aef090ade6b62974c7a274098c390599e8c72b4 | 2025-01-22 |
297-
| node:22 | sha256:ae2f3d4cc65d251352eca01ba668824f651a2ee4d2a37e2efb22649521a483fd | 2025-01-22 |
298+
| node:22 | sha256:5145c882f9e32f07dd7593962045d97f221d57a1b609f5bf7a807eb89deff9d6 | 2025-01-22 |
298299
| node:22-alpine | sha256:e2b39f7b64281324929257d0f8004fb6cb4bf0fdfb9aa8cedb235a766aec31da | 2025-01-22 |
299300
| ubuntu:20.04 | sha256:8e5c4f0285ecbb4ead070431d29b576a530d3166df73ec44affc1cd27555141b | 2024-10-11 |
300301

@@ -332,7 +333,7 @@ Use the following command as a part of your job to start the service: 'sudo syst
332333
| lib32z1 | 1:1.2.11.dfsg-2ubuntu1.5 |
333334
| libc++-dev | 1:10.0-50\~exp1 |
334335
| libc++abi-dev | 1:10.0-50\~exp1 |
335-
| libc6-dev | 2.31-0ubuntu9.16 |
336+
| libc6-dev | 2.31-0ubuntu9.17 |
336337
| libcurl4 | 7.68.0-1ubuntu2.25 |
337338
| libgbm-dev | 21.2.6-0ubuntu0.1\~20.04.2 |
338339
| libgconf-2-4 | 3.2.6-6ubuntu1 |
@@ -348,7 +349,7 @@ Use the following command as a part of your job to start the service: 'sudo syst
348349
| libxkbfile-dev | 1:1.1.0-1 |
349350
| libxss1 | 1:1.2.3-1 |
350351
| libyaml-dev | 0.2.2-1 |
351-
| locales | 2.31-0ubuntu9.16 |
352+
| locales | 2.31-0ubuntu9.17 |
352353
| m4 | 1.4.18-4 |
353354
| make | 4.2.1-1.2 |
354355
| mediainfo | 19.09-1build1 |

‎images/ubuntu/Ubuntu2204-Readme.md‎

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Ubuntu 22.04
22
- OS Version: 22.04.5 LTS
33
- Kernel Version: 6.5.0-1025-azure
4-
- Image Version: 20250202.1.0
4+
- Image Version: 20250209.1.0
55
- Systemd version: 249.11-0ubuntu3.12
66

77
## Installed Software
@@ -27,15 +27,15 @@
2727
### Package Management
2828
- cpan 1.64
2929
- Helm 3.17.0
30-
- Homebrew 4.4.19
31-
- Miniconda 24.11.1
30+
- Homebrew 4.4.20
31+
- Miniconda 25.1.1
3232
- Npm 10.8.2
3333
- NuGet 6.6.1.2
3434
- Pip 22.0.2
3535
- Pip3 22.0.2
3636
- Pipx 1.7.1
3737
- RubyGems 3.3.5
38-
- Vcpkg (build from commit 0ca64b4e1)
38+
- Vcpkg (build from commit 74ec888e38)
3939
- Yarn 1.22.22
4040

4141
#### Environment variables
@@ -79,7 +79,7 @@ to accomplish this.
7979
- Git LFS 3.6.1
8080
- Git-ftp 1.6.0
8181
- Haveged 1.9.14
82-
- Heroku 10.0.2
82+
- Heroku 10.1.0
8383
- jq 1.6
8484
- Kind 0.26.0
8585
- Kubectl 1.32.1
@@ -95,7 +95,7 @@ to accomplish this.
9595
- Packer 1.12.0
9696
- Parcel 2.13.3
9797
- Podman 3.4.4
98-
- Pulumi 3.148.0
98+
- Pulumi 3.149.0
9999
- R 4.4.2
100100
- Skopeo 1.4.1
101101
- Sphinx Open Source Search Server 2.2.11
@@ -106,18 +106,18 @@ to accomplish this.
106106
- zstd 1.5.6
107107

108108
### CLI Tools
109-
- Alibaba Cloud CLI 3.0.250
110-
- AWS CLI 2.23.11
111-
- AWS CLI Session Manager Plugin 1.2.694.0
112-
- AWS SAM CLI 1.132.0
109+
- Alibaba Cloud CLI 3.0.251
110+
- AWS CLI 2.24.0
111+
- AWS CLI Session Manager Plugin 1.2.707.0
112+
- AWS SAM CLI 1.133.0
113113
- Azure CLI 2.68.0
114114
- Azure CLI (azure-devops) 1.0.1
115115
- GitHub CLI 2.66.1
116-
- Google Cloud CLI 508.0.0
117-
- Netlify CLI 18.0.3
118-
- OpenShift CLI 4.17.14
116+
- Google Cloud CLI 509.0.0
117+
- Netlify CLI 18.0.4
118+
- OpenShift CLI 4.17.15
119119
- ORAS CLI 1.2.2
120-
- Vercel CLI 40.1.0
120+
- Vercel CLI 41.0.2
121121

122122
### Java
123123
| Version | Environment Variable |
@@ -156,13 +156,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled.
156156
- Rustfmt 1.8.0
157157

158158
### Browsers and Drivers
159-
- Google Chrome 132.0.6834.159
160-
- ChromeDriver 132.0.6834.159
161-
- Chromium 132.0.6834.0
159+
- Google Chrome 133.0.6943.53
160+
- ChromeDriver 133.0.6943.53
161+
- Chromium 133.0.6943.0
162162
- Microsoft Edge 132.0.2957.140
163163
- Microsoft Edge WebDriver 132.0.2957.140
164164
- Selenium server 4.28.1
165-
- Mozilla Firefox 134.0.2
165+
- Mozilla Firefox 135.0
166166
- Geckodriver 0.35.0
167167

168168
#### Environment variables
@@ -205,8 +205,8 @@ Use the following command as a part of your job to start the service: 'sudo syst
205205

206206
#### Go
207207
- 1.21.13
208-
- 1.22.11
209-
- 1.23.5
208+
- 1.22.12
209+
- 1.23.6
210210

211211
#### Node.js
212212
- 18.20.6
@@ -218,18 +218,18 @@ Use the following command as a part of your job to start the service: 'sudo syst
218218
- 3.9.21
219219
- 3.10.16
220220
- 3.11.11
221-
- 3.12.8
222-
- 3.13.1
221+
- 3.12.9
222+
- 3.13.2
223223

224224
#### PyPy
225225
- 3.7.13 [PyPy 7.3.9]
226226
- 3.8.16 [PyPy 7.3.11]
227227
- 3.9.19 [PyPy 7.3.16]
228-
- 3.10.14 [PyPy 7.3.17]
228+
- 3.10.16 [PyPy 7.3.18]
229229

230230
#### Ruby
231231
- 3.1.6
232-
- 3.2.6
232+
- 3.2.7
233233
- 3.3.7
234234

235235
### PowerShell Tools
@@ -253,6 +253,7 @@ Use the following command as a part of your job to start the service: 'sudo syst
253253
| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
254254
| Android Command Line Tools | 9.0 |
255255
| Android SDK Build-tools | 35.0.0 35.0.1<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 |
256+
| Android SDK Platform-Tools | 35.0.2 |
256257
| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) |
257258
| Android Support Repository | 47.0.0 |
258259
| CMake | 3.10.2<br>3.18.1<br>3.22.1 |
@@ -278,16 +279,16 @@ Use the following command as a part of your job to start the service: 'sudo syst
278279
| alpine:3.18 | sha256:dd60c75fba961ecc5e918961c713f3c42dd5665171c58f9b2ef5aafe081ad5a0 | 2025-01-08 |
279280
| alpine:3.19 | sha256:6380aa6b04faa579332d4c9d1f65bd7093012ba6e01d9bbcd5e2d8a4f9fae38f | 2025-01-08 |
280281
| debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 |
281-
| debian:11 | sha256:e5bfb7364038fd100c2faebdd674145bd1bc758a57f3c67023cced99d0eff0f7 | 2025-01-13 |
282+
| debian:11 | sha256:63904b1442dc0bb1e7a7a7065b3ba0d10d4e300f984115a40d371827fe4e3a85 | 2025-02-03 |
282283
| moby/buildkit:latest | sha256:14aa1b4dd92ea0a4cd03a54d0c6079046ea98cd0c0ae6176bdd7036ba370cbbe | 2025-01-20 |
283-
| node:18 | sha256:720eeea325b3da50e108ba34dde0fd69feeb3c59485199c5e22b0ea49a792aa5 | 2025-01-22 |
284+
| node:18 | sha256:f12d34408955b2081f82078e8f96c3299ca0f38d11e76086cb9b9b1b669977e4 | 2025-01-22 |
284285
| node:18-alpine | sha256:974afb6cbc0314dc6502b14243b8a39fbb2d04d975e9059dd066be3e274fbb25 | 2025-01-22 |
285-
| node:20 | sha256:bc3d86568d9a9e062cdf7036367f6e2ce201925e2912758bcd3b0e2657875a63 | 2025-01-22 |
286+
| node:20 | sha256:3496cba96d3548fc484a7febc77edebffcae693aff6a067bc34ec6d8c1f7affe | 2025-01-22 |
286287
| node:20-alpine | sha256:2cd2a6f4cb37cf8a007d5f1e9aef090ade6b62974c7a274098c390599e8c72b4 | 2025-01-22 |
287-
| node:22 | sha256:ae2f3d4cc65d251352eca01ba668824f651a2ee4d2a37e2efb22649521a483fd | 2025-01-22 |
288+
| node:22 | sha256:5145c882f9e32f07dd7593962045d97f221d57a1b609f5bf7a807eb89deff9d6 | 2025-01-22 |
288289
| node:22-alpine | sha256:e2b39f7b64281324929257d0f8004fb6cb4bf0fdfb9aa8cedb235a766aec31da | 2025-01-22 |
289290
| ubuntu:20.04 | sha256:8e5c4f0285ecbb4ead070431d29b576a530d3166df73ec44affc1cd27555141b | 2024-10-11 |
290-
| ubuntu:22.04 | sha256:0e5e4a57c2499249aafc3b40fcd541e9a456aab7296681a3994d631587203f97 | 2024-09-11 |
291+
| ubuntu:22.04 | sha256:ed1544e454989078f5dec1bfdabd8c5cc9c48e0705d07b678ab6ae3fb61952d2 | 2025-01-26 |
291292

292293
### Installed apt packages
293294
| Name | Version |
@@ -323,7 +324,7 @@ Use the following command as a part of your job to start the service: 'sudo syst
323324
| lib32z1 | 1:1.2.11.dfsg-2ubuntu9.2 |
324325
| libc++-dev | 1:14.0-55\~exp2 |
325326
| libc++abi-dev | 1:14.0-55\~exp2 |
326-
| libc6-dev | 2.35-0ubuntu3.8 |
327+
| libc6-dev | 2.35-0ubuntu3.9 |
327328
| libcurl4 | 7.81.0-1ubuntu1.20 |
328329
| libgbm-dev | 23.2.1-1ubuntu3.1\~22.04.3 |
329330
| libgconf-2-4 | 3.2.6-7ubuntu2 |
@@ -340,7 +341,7 @@ Use the following command as a part of your job to start the service: 'sudo syst
340341
| libxkbfile-dev | 1:1.1.0-1build3 |
341342
| libxss1 | 1:1.2.3-1build2 |
342343
| libyaml-dev | 0.2.2-1build2 |
343-
| locales | 2.35-0ubuntu3.8 |
344+
| locales | 2.35-0ubuntu3.9 |
344345
| lz4 | 1.9.3-2build2 |
345346
| m4 | 1.4.18-5ubuntu2 |
346347
| make | 4.3-4.1build1 |

0 commit comments

Comments
 (0)