Commit 757d6f1
authored
CI: ensure that macOS runner is x64 (#1807)
---------- Motivation ----------
The runner images for 'macOS 13' had the following convention
regarding the hardware architecture:
- 'macos-13' --> x64
- 'macos-13-xlarge' --> arm64
It has been different since 'macOS 14':
- 'macos-14' --> arm64
- 'macos-14-large' --> x64
- 'macos-15' --> arm64
- 'macos-15-intel' and 'macos-15-large' --> x64
In January 2026 the runner image was updated from 'macos-13' to 'macos-14'
because the older version was deprecated. It was not checked that the runner
architecture is different -- the change in runner naming convention was not
expected.
Recently the job, which executes functional tests for Swift generated
code on macOS started to fail. The installation of Java did not work properly.
The investigation revealed that Java was installed for x64 instead of arm64.
The action used to install Java cannot be configured for arm.
---------- Solution ----------
Introduced the usage of 'macos-15-intel' runner to ensure that the hardware
architecture of the runner is x64. Moreover, adjusted the environment variable
to avoid problems with 'JAVA_HOME' variable.
Signed-off-by: Patryk Wrobel <183546751+pwrobeldev@users.noreply.github.com>1 parent e1875a1 commit 757d6f1
2 files changed
Lines changed: 6 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
| 15 | + | |
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| |||
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
| 39 | + | |
39 | 40 | | |
40 | 41 | | |
41 | 42 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
260 | 260 | | |
261 | 261 | | |
262 | 262 | | |
263 | | - | |
| 263 | + | |
264 | 264 | | |
265 | 265 | | |
266 | 266 | | |
| |||
285 | 285 | | |
286 | 286 | | |
287 | 287 | | |
| 288 | + | |
288 | 289 | | |
289 | 290 | | |
290 | 291 | | |
| |||
295 | 296 | | |
296 | 297 | | |
297 | 298 | | |
| 299 | + | |
298 | 300 | | |
299 | 301 | | |
300 | 302 | | |
301 | 303 | | |
| 304 | + | |
302 | 305 | | |
303 | 306 | | |
304 | 307 | | |
| |||
0 commit comments