Skip to content

Commit 10bf39e

Browse files
shamil-mubarakshinshamil-mubarakshin
authored
Sync fix for macos-new-folder-structure (#8753)
* New folder structure * Update packer templates * Update refs in scripts * Fix utils path in templates
1 parent b2d542d commit 10bf39e

File tree

6 files changed

+121
-121
lines changed

6 files changed

+121
-121
lines changed

‎images/macos/macos-12-Readme.md‎

Lines changed: 96 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,50 @@
1-
| Announcements |
2-
|-|
3-
| [[All OS] hub utility will be removed on October 2](https://github.com/actions/runner-images/issues/8362) |
4-
***
51
# macOS 12
62
- OS Version: macOS 12.7 (21G816)
73
- Kernel Version: Darwin 21.6.0
8-
- Image Version: 20230921.4
4+
- Image Version: 20231029.1
95

106
## Installed Software
117

128
### Language and Runtime
13-
- .NET Core SDK: 6.0.414, 7.0.102, 7.0.202, 7.0.306, 7.0.401
9+
- .NET Core SDK: 6.0.416, 7.0.102, 7.0.202, 7.0.306, 7.0.403
1410
- Bash 3.2.57(1)-release
1511
- Clang/LLVM 14.0.0
1612
- Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang`
1713
- GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias
1814
- GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias
15+
- GCC 13 (Homebrew GCC 13.2.0) - available by `gcc-13` alias
1916
- GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias
2017
- GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias
18+
- GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias
2119
- Julia 1.9.3
2220
- Kotlin 1.9.10-release-459
23-
- Go 1.20.8
21+
- Go 1.20.10
2422
- Mono 6.12.0.188
23+
- Node.js 18.18.2
2524
- MSBuild 16.10.1.51301 (Mono 6.12.0.188)
26-
- Node.js 18.18.0
2725
- NVM 0.39.5
28-
- NVM - Cached node versions: 14.21.3, 16.20.2, 18.18.0
29-
- Perl 5.36.1
30-
- PHP 8.2.10
26+
- NVM - Cached node versions: 14.21.3, 16.20.2, 18.18.2, 20.9.0
27+
- Perl 5.38.0
28+
- PHP 8.2.12
3129
- Python 2.7.18
32-
- Python3 3.11.5
30+
- Python3 3.12.0
3331
- R 4.3.1
3432
- Ruby 3.0.6p216
3533

3634
### Package Management
37-
- Bundler 2.4.19
35+
- Bundler 2.4.21
3836
- Carthage 0.39.1
39-
- CocoaPods 1.12.1
40-
- Composer 2.6.3
41-
- Homebrew 4.1.12
42-
- Miniconda 23.5.2
37+
- CocoaPods 1.14.2
38+
- Composer 2.6.5
39+
- Homebrew 4.1.17
40+
- Miniconda 23.9.0
4341
- NPM 9.8.1
4442
- NuGet 6.3.1.1
4543
- Pip 20.3.4 (python 2.7)
46-
- Pip3 23.2.1 (python 3.11)
47-
- Pipx 1.2.0
48-
- RubyGems 3.4.19
49-
- Vcpkg 2023 (build from commit 7476f0d4e)
44+
- Pip3 23.3.1 (python 3.12)
45+
- Pipx 1.2.1
46+
- RubyGems 3.4.21
47+
- Vcpkg 2023 (build from commit 06c79a9af)
5048
- Yarn 1.22.19
5149

5250
#### Environment variables
@@ -57,29 +55,28 @@
5755

5856
### Project Management
5957
- Apache Ant 1.10.14
60-
- Apache Maven 3.9.4
61-
- Gradle 8.3
62-
- Sbt 1.9.6
58+
- Apache Maven 3.9.5
59+
- Gradle 8.4
60+
- Sbt 1.9.7
6361

6462
### Utilities
6563
- 7-Zip 17.05
6664
- aria2 1.36.0
67-
- azcopy 10.20.1
68-
- bazel 6.3.2
65+
- azcopy 10.21.1
66+
- bazel 6.4.0
6967
- bazelisk 1.18.0
7068
- bsdtar 3.5.1 - available by 'tar' alias
71-
- Curl 8.3.0
69+
- Curl 8.4.0
7270
- Git 2.42.0
7371
- Git LFS 3.4.0
74-
- GitHub CLI 2.35.0
72+
- GitHub CLI 2.37.0
7573
- GNU Tar 1.35 - available by 'gtar' alias
7674
- GNU Wget 1.21.4
7775
- gpg (GnuPG) 2.4.3
78-
- Hub CLI 2.14.2
79-
- ImageMagick 7.1.1-17
76+
- ImageMagick 7.1.1-21
8077
- jq 1.7
81-
- mongo 5.0.17
82-
- mongod 5.0.17
78+
- mongo 5.0.21
79+
- mongod 5.0.21
8380
- OpenSSL 1.1.1w 11 Sep 2023
8481
- Packer 1.9.4
8582
- pkg-config 0.29.2
@@ -88,47 +85,47 @@
8885
- Sox 14.4.2
8986
- Subversion (SVN) 1.14.2
9087
- Switchaudio-osx 1.2.2
91-
- Vagrant 2.3.7
92-
- VirtualBox 6.1.38r153438
93-
- yq 4.35.1
88+
- Vagrant 2.4.0
89+
- VirtualBox 7.0.12r159484
90+
- yq 4.35.2
9491
- zstd 1.5.5
9592

9693
### Tools
9794
- App Center CLI 2.14.0
98-
- AWS CLI 2.13.20
99-
- AWS SAM CLI 1.97.0
95+
- AWS CLI 2.13.30
96+
- AWS SAM CLI 1.99.0
10097
- AWS Session Manager CLI 1.2.497.0
101-
- Azure CLI 2.52.0
98+
- Azure CLI 2.53.1
10299
- Azure CLI (azure-devops) 0.26.0
103-
- Bicep CLI 0.21.1
100+
- Bicep CLI 0.22.6
104101
- Cabal 3.6.2.0
105-
- Cmake 3.27.6
106-
- CodeQL Action Bundles 2.14.4 2.14.5
107-
- Colima 0.5.5
102+
- Cmake 3.27.7
103+
- CodeQL Action Bundle 2.15.1
104+
- Colima 0.5.6
108105
- Fastlane 2.216.0
109-
- GHC 9.6.2
106+
- GHC 9.8.1
110107
- GHCup 0.1.19.4
111108
- Jazzy 0.14.4
112-
- Stack 2.9.3
113-
- SwiftFormat 0.52.4
109+
- Stack 2.13.1
110+
- SwiftFormat 0.52.8
114111
- Swig 4.1.1
115112
- Xcode Command Line Tools 14.2.0.0.1.1668646533
116113

117114
### Linters
118-
- SwiftLint 0.52.4
115+
- SwiftLint 0.53.0
119116
- Yamllint 1.32.0
120117

121118
### Browsers
122-
- Safari 16.6.1 (17615.3.12.11.5)
123-
- SafariDriver 16.6.1 (17615.3.12.11.5)
124-
- Google Chrome 117.0.5938.92
125-
- Google Chrome for Testing 117.0.5938.92
126-
- ChromeDriver 117.0.5938.92
127-
- Microsoft Edge 117.0.2045.35
128-
- Microsoft Edge WebDriver 117.0.2045.35
129-
- Mozilla Firefox 117.0.1
119+
- Safari 17.0 (17616.1.27.111.22)
120+
- SafariDriver 17.0 (17616.1.27.111.22)
121+
- Google Chrome 118.0.5993.117
122+
- Google Chrome for Testing 118.0.5993.70
123+
- ChromeDriver 118.0.5993.70
124+
- Microsoft Edge 118.0.2088.76
125+
- Microsoft Edge WebDriver 118.0.2088.76
126+
- Mozilla Firefox 119.0
130127
- geckodriver 0.33.0
131-
- Selenium server 4.12.1
128+
- Selenium server 4.14.1
132129

133130
#### Environment variables
134131
| Name | Value |
@@ -140,9 +137,10 @@
140137
### Java
141138
| Version | Environment Variable |
142139
| ------------------- | -------------------- |
143-
| 8.0.382+5 (default) | JAVA_HOME_8_X64 |
144-
| 11.0.20+101 | JAVA_HOME_11_X64 |
145-
| 17.0.8+101 | JAVA_HOME_17_X64 |
140+
| 8.0.392+8 (default) | JAVA_HOME_8_X64 |
141+
| 11.0.21+9 | JAVA_HOME_11_X64 |
142+
| 17.0.9+9 | JAVA_HOME_17_X64 |
143+
| 21.0.1+12.0.LTS | JAVA_HOME_21_X64 |
146144

147145
### Cached Tools
148146

@@ -151,66 +149,68 @@
151149
- 3.0.6
152150
- 3.1.4
153151

152+
#### PyPy
153+
- 2.7.18 [PyPy 7.3.13]
154+
- 3.7.13 [PyPy 7.3.9]
155+
- 3.8.16 [PyPy 7.3.11]
156+
- 3.9.18 [PyPy 7.3.13]
157+
- 3.10.13 [PyPy 7.3.13]
158+
154159
#### Python
155160
- 3.7.17
156161
- 3.8.18
157162
- 3.9.18
158163
- 3.10.13
159-
- 3.11.5
160-
161-
#### PyPy
162-
- 2.7.18 [PyPy 7.3.12]
163-
- 3.7.13 [PyPy 7.3.9]
164-
- 3.8.16 [PyPy 7.3.11]
165-
- 3.9.17 [PyPy 7.3.12]
166-
- 3.10.12 [PyPy 7.3.12]
164+
- 3.11.6
165+
- 3.12.0
167166

168167
#### Node.js
169168
- 14.21.3
170169
- 16.20.2
171-
- 18.18.0
170+
- 18.18.2
171+
- 20.9.0
172172

173173
#### Go
174174
- 1.19.13
175-
- 1.20.8
176-
- 1.21.1
175+
- 1.20.10
176+
- 1.21.3
177177

178178
### Rust Tools
179-
- Cargo 1.72.1
180-
- Rust 1.72.1
181-
- Rustdoc 1.72.1
179+
- Cargo 1.73.0
180+
- Rust 1.73.0
181+
- Rustdoc 1.73.0
182182
- Rustup 1.26.0
183183

184184
#### Packages
185185
- Bindgen 0.68.1
186-
- Cargo-audit 0.18.1
186+
- Cargo-audit 0.18.3
187187
- Cargo-outdated 0.13.1
188188
- Cbindgen 0.26.0
189-
- Clippy 0.1.72
189+
- Clippy 0.1.73
190190
- Rustfmt 1.6.0-stable
191191

192192
### PowerShell Tools
193-
- PowerShell 7.2.14
193+
- PowerShell 7.2.16
194194

195195
#### PowerShell Modules
196-
- Az: 10.3.0
196+
- Az: 10.4.1
197197
- MarkdownPS: 1.9
198198
- Pester: 5.5.0
199199
- PSScriptAnalyzer: 1.21.0
200200

201201
### Web Servers
202-
| Name | Version | ConfigFile | ServiceStatus | ListenPort |
203-
| ----- | -------- | ------------------------------- | ------------- | ---------- |
204-
| httpd | 2.4.57_1 | /usr/local/etc/httpd/httpd.conf | none | 80 |
205-
| nginx | 1.25.2 | /usr/local/etc/nginx/nginx.conf | none | 80 |
202+
| Name | Version | ConfigFile | ServiceStatus | ListenPort |
203+
| ----- | ------- | ------------------------------- | ------------- | ---------- |
204+
| httpd | 2.4.58 | /usr/local/etc/httpd/httpd.conf | none | 80 |
205+
| nginx | 1.25.3 | /usr/local/etc/nginx/nginx.conf | none | 80 |
206206

207207
### Xamarin
208208

209209
#### Visual Studio for Mac
210210
| Version | Build | Path |
211211
| -------------- | ---------- | ------------------------------------ |
212212
| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app |
213-
| 2022 (default) | 17.6.4.472 | /Applications/Visual Studio.app |
213+
| 2022 (default) | 17.6.6.408 | /Applications/Visual Studio.app |
214214

215215
##### Notes
216216
```
@@ -326,27 +326,27 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app"
326326
| watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) |
327327

328328
### Android
329-
| Package Name | Version |
330-
| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
331-
| Android Command Line Tools | 8.0 |
332-
| Android Emulator | 32.1.15 |
333-
| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 |
334-
| Android SDK Platforms | android-34 (rev 2)<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)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) |
335-
| Android SDK Platform-Tools | 34.0.4 |
336-
| Android Support Repository | 47.0.0 |
337-
| CMake | 3.18.1<br>3.22.1 |
338-
| Google Play services | 49 |
339-
| Google Repository | 58 |
340-
| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default)<br>26.0.10792818 |
341-
| SDK Patch Applier v4 | 1 |
329+
| Package Name | Version |
330+
| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
331+
| Android Command Line Tools | 8.0 |
332+
| Android Emulator | 32.1.15 |
333+
| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 |
334+
| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34 (rev 2)<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)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) |
335+
| Android SDK Platform-Tools | 34.0.5 |
336+
| Android Support Repository | 47.0.0 |
337+
| CMake | 3.18.1<br>3.22.1 |
338+
| Google Play services | 49 |
339+
| Google Repository | 58 |
340+
| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 |
341+
| SDK Patch Applier v4 | 1 |
342342

343343
#### Environment variables
344344
| Name | Value |
345345
| ----------------------- | --------------------------------------------------- |
346346
| ANDROID_HOME | /Users/runner/Library/Android/sdk |
347347
| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 |
348348
| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 |
349-
| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.0.10792818 |
349+
| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 |
350350
| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 |
351351
| ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk |
352352

@@ -359,7 +359,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app"
359359
#### Environment variables
360360
| Name | Value |
361361
| ----------------- | ----------------------------------------------------------------------------------------- |
362-
| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v19/19.0.0-54570/ParallelsDesktop-19.0.0-54570.dmg |
362+
| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v19/19.1.0-54729/ParallelsDesktop-19.1.0-54729.dmg |
363363

364364
##### Notes
365365
```

‎images/macos/templates/macOS-11.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@
8888
"inline": [
8989
"mv ~/image-generation/docs-gen ~/image-generation/software-report",
9090
"mv ~/image-generation/xamarin-selector ~/image-generation/assets",
91-
"mkdir ~/image-generation/utils",
92-
"mv ~/image-generation/helpers/confirm-identified-developers.scpt ~/image-generation/utils",
93-
"mv ~/image-generation/helpers/invoke-tests.sh ~/image-generation/utils",
94-
"mv ~/image-generation/helpers/utils.sh ~/image-generation/utils",
95-
"mv ~/image-generation/helpers/xamarin-utils.sh ~/image-generation/utils"
91+
"mkdir ~/utils",
92+
"mv ~/image-generation/helpers/confirm-identified-developers.scpt ~/utils",
93+
"mv ~/image-generation/helpers/invoke-tests.sh ~/utils",
94+
"mv ~/image-generation/helpers/utils.sh ~/utils",
95+
"mv ~/image-generation/helpers/xamarin-utils.sh ~/utils"
9696
],
9797
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
9898
},

‎images/macos/templates/macOS-12.anka.pkr.hcl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,11 @@ build {
120120
inline = [
121121
"mv ~/image-generation/docs-gen ~/image-generation/software-report",
122122
"mv ~/image-generation/xamarin-selector ~/image-generation/assets",
123-
"mkdir ~/image-generation/utils",
124-
"mv ~/image-generation/helpers/confirm-identified-developers.scpt ~/image-generation/utils",
125-
"mv ~/image-generation/helpers/invoke-tests.sh ~/image-generation/utils",
126-
"mv ~/image-generation/helpers/utils.sh ~/image-generation/utils",
127-
"mv ~/image-generation/helpers/xamarin-utils.sh ~/image-generation/utils"
123+
"mkdir ~/utils",
124+
"mv ~/image-generation/helpers/confirm-identified-developers.scpt ~/utils",
125+
"mv ~/image-generation/helpers/invoke-tests.sh ~/utils",
126+
"mv ~/image-generation/helpers/utils.sh ~/utils",
127+
"mv ~/image-generation/helpers/xamarin-utils.sh ~/utils"
128128
]
129129
}
130130
provisioner "shell" {

‎images/macos/templates/macOS-12.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@
8888
"inline": [
8989
"mv ~/image-generation/docs-gen ~/image-generation/software-report",
9090
"mv ~/image-generation/xamarin-selector ~/image-generation/assets",
91-
"mkdir ~/image-generation/utils",
92-
"mv ~/image-generation/helpers/confirm-identified-developers.scpt ~/image-generation/utils",
93-
"mv ~/image-generation/helpers/invoke-tests.sh ~/image-generation/utils",
94-
"mv ~/image-generation/helpers/utils.sh ~/image-generation/utils",
95-
"mv ~/image-generation/helpers/xamarin-utils.sh ~/image-generation/utils"
91+
"mkdir ~/utils",
92+
"mv ~/image-generation/helpers/confirm-identified-developers.scpt ~/utils",
93+
"mv ~/image-generation/helpers/invoke-tests.sh ~/utils",
94+
"mv ~/image-generation/helpers/utils.sh ~/utils",
95+
"mv ~/image-generation/helpers/xamarin-utils.sh ~/utils"
9696
],
9797
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
9898
},

0 commit comments

Comments
 (0)