Skip to content

Commit 5d9fd3e

Browse files
committed
[GR-70087] Remove support for darwin/amd64 CI jobs.
PullRequest: graal/22226
2 parents 53c895b + 2c42b35 commit 5d9fd3e

File tree

29 files changed

+38
-206
lines changed

29 files changed

+38
-206
lines changed

ci/ci_common/common.jsonnet

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ common + common.frequencies + {
140140
linux_amd64_ubuntu: common.linux_amd64_ubuntu + graal_common_extras,
141141
linux_aarch64: common.linux_aarch64 + graal_common_extras + linux_deps_extras,
142142
linux_aarch64_ol9: common.linux_aarch64_ol9 + graal_common_extras + linux_deps_extras,
143-
darwin_amd64: common.darwin_amd64 + graal_common_extras,
144143
darwin_aarch64: common.darwin_aarch64 + graal_common_extras,
145144
windows_amd64: common.windows_amd64 + graal_common_extras,
146145
windows_server_2016_amd64: common.windows_server_2016_amd64 + graal_common_extras,

ci/common.jsonnet

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -363,9 +363,7 @@ local common_json = import "../common.json";
363363
pcre2: '==10.37',
364364
gnur: '==4.0.3-gcc4.8.5-pcre2',
365365
} + if (std.objectHasAll(self, 'os_distro') && self['os_distro'] == 'ol' && std.objectHasAll(self, 'os_distro_version') && self['os_distro_version'] == '9') then {curl: '==7.78.0'} else {curl: '==7.50.1'}
366-
else if (self.os == "darwin" && self.arch == "amd64") then {
367-
'pcre2': '==10.37',
368-
} else {},
366+
else {},
369367
environment+:
370368
if (self.os == "linux" && self.arch == "amd64") then {
371369
TZDIR: '/usr/share/zoneinfo',
@@ -376,25 +374,14 @@ local common_json = import "../common.json";
376374
GNUR_HOME_BINARY: '/cm/shared/apps/gnur/4.0.3_gcc4.8.5_pcre2-10.37/R-4.0.3',
377375
FASTR_RELEASE: 'true',
378376
}
379-
else if (self.os == "darwin" && self.arch == "amd64") then {
380-
FASTR_FC: '/cm/shared/apps/gcc/8.3.0/bin/gfortran',
381-
FASTR_CC: '/cm/shared/apps/gcc/8.3.0/bin/gcc',
382-
TZDIR: '/usr/share/zoneinfo',
383-
PKG_INCLUDE_FLAGS_OVERRIDE : '-I/cm/shared/apps/pcre2/pcre2-10.37/include -I/cm/shared/apps/bzip2/1.0.6/include -I/cm/shared/apps/xz/5.2.2/include -I/cm/shared/apps/curl/7.50.1/include',
384-
PKG_LDFLAGS_OVERRIDE : '-L/cm/shared/apps/bzip2/1.0.6/lib -L/cm/shared/apps/xz/5.2.2/lib -L/cm/shared/apps/pcre2/pcre2-10.37/lib -L/cm/shared/apps/curl/7.50.1/lib -L/cm/shared/apps/gcc/10.2.0/lib -L/usr/lib',
385-
FASTR_RELEASE: 'true',
386-
} else {},
377+
else {},
387378
downloads+:
388379
if (self.os == "linux" && self.arch == "amd64") then {
389380
BLAS_LAPACK_DIR: { name: 'fastr-403-blas-lapack-gcc', version: '4.8.5', platformspecific: true },
390381
F2C_BINARY: { name: 'f2c-binary', version: '7', platformspecific: true },
391382
FASTR_RECOMMENDED_BINARY: { name: 'fastr-recommended-pkgs', version: '16', platformspecific: true },
392383
}
393-
else if (self.os == "darwin" && self.arch == "amd64") then {
394-
BLAS_LAPACK_DIR: { name: "fastr-403-blas-lapack-gcc", version: "8.3.0", platformspecific: true },
395-
F2C_BINARY: { name: 'f2c-binary', version: '7', platformspecific: true },
396-
FASTR_RECOMMENDED_BINARY: { name: 'fastr-recommended-pkgs', version: '16', platformspecific: true },
397-
} else {},
384+
else {},
398385
catch_files+: if (self.os != "windows" && self.arch == "amd64") then [
399386
'GNUR_CONFIG_LOG = (?P<filename>.+\\.log)',
400387
'GNUR_MAKE_LOG = (?P<filename>.+\\.log)',
@@ -550,7 +537,6 @@ local common_json = import "../common.json";
550537

551538
linux_amd64_ubuntu: linux + amd64 + ubuntu22 + { os_distro:: "ubuntu", os_distro_version:: "22" },
552539

553-
darwin_amd64: darwin + amd64,
554540
darwin_aarch64: darwin + aarch64,
555541

556542
windows_amd64: windows + amd64,
@@ -581,7 +567,6 @@ local common_json = import "../common.json";
581567

582568
linux_amd64_ubuntu: self.bare.linux_amd64_ubuntu + common,
583569

584-
darwin_amd64: self.bare.darwin_amd64 + common,
585570
darwin_aarch64: self.bare.darwin_aarch64 + common,
586571

587572
windows_amd64: self.bare.windows_amd64 + common,

compiler/ci/ci_common/gate.jsonnet

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -273,27 +273,22 @@
273273
# Each value in this map is an object that overrides or extends the
274274
# fields of the denoted build.
275275
local dailies = {
276-
"compiler-test-labsjdk-latest-darwin-amd64": {},
277276
"compiler-test-labsjdk-latest-windows-amd64": {},
278277

279278
"compiler-test_zgc-labsjdk-latest-darwin-aarch64": {},
280-
"compiler-test_zgc-labsjdk-latest-darwin-amd64": {},
281279
"compiler-test_zgc-labsjdk-latest-linux-aarch64": {},
282280
"compiler-test_zgc-labsjdk-latest-linux-amd64": {},
283281

284282
"compiler-ctw-labsjdk-latest-darwin-aarch64": {},
285-
"compiler-ctw-labsjdk-latest-darwin-amd64": {},
286283
"compiler-ctw-labsjdk-latest-linux-aarch64": {},
287284
"compiler-ctw-labsjdk-latest-windows-amd64": {},
288285

289286
"compiler-ctw_zgc-labsjdk-latest-linux-amd64": {},
290287

291288
"compiler-ctw_economy-labsjdk-latest-darwin-aarch64": {},
292-
"compiler-ctw_economy-labsjdk-latest-darwin-amd64": {},
293289
"compiler-ctw_economy-labsjdk-latest-linux-aarch64": {},
294290
"compiler-ctw_economy-labsjdk-latest-windows-amd64": {},
295291

296-
"compiler-bootstrap_lite-labsjdk-latest-darwin-amd64": {},
297292

298293
"compiler-bootstrap_full-labsjdk-latest-linux-amd64": {},
299294
"compiler-bootstrap_full_zgc-labsjdk-latest-linux-amd64": {},
@@ -334,7 +329,6 @@
334329

335330
"compiler-test_serialgc-labsjdk-latest-linux-amd64": {},
336331
"compiler-test_serialgc-labsjdk-latest-linux-aarch64": {},
337-
"compiler-test_serialgc-labsjdk-latest-darwin-amd64": {},
338332
"compiler-test_serialgc-labsjdk-latest-darwin-aarch64": {},
339333

340334
"compiler-truffle_xcomp_serialgc-labsjdk-latest-linux-amd64": {},
@@ -439,7 +433,6 @@
439433
local all_os_arches = [
440434
"linux-amd64",
441435
"linux-aarch64",
442-
"darwin-amd64",
443436
"darwin-aarch64",
444437
"windows-amd64"
445438
],
@@ -490,7 +483,6 @@
490483
for os_arch in [
491484
"linux-amd64",
492485
"linux-aarch64",
493-
"darwin-amd64",
494486
"darwin-aarch64"
495487
]
496488
for task in [
@@ -526,7 +518,6 @@
526518
for os_arch in [
527519
"linux-amd64",
528520
"linux-aarch64",
529-
"darwin-amd64",
530521
"darwin-aarch64"
531522
]
532523
for task in [

docs/getting-started/macos.md

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ redirect_from: /docs/getting-started/macos/
88

99
## Installation on macOS Platforms
1010

11-
GraalVM is available for macOS on x64 and AArch64 architectures.
11+
GraalVM is available for macOS on AArch64 architecture. Support for macOS on x64 architecture has been removed.
1212
You can install GraalVM on macOS:
13+
1314
* [using SDKMAN!](#sdkman)
1415
* [from an archive](#from-an-archive)
1516
* [using script-friendly URLs](#script-friendly-urls)
@@ -25,6 +26,7 @@ Install Oracle GraalVM with [SDKMAN!](https://sdkman.io/){:target="_blank"}:
2526
```bash
2627
sdk install java <version>-graal
2728
```
29+
2830
To install GraalVM Community Edition, change the distribution from `graal` to `graalce` in the command.
2931

3032
SDKMAN! helps you install and easily switch between JDKs.
@@ -51,26 +53,34 @@ sdk default java <version>-graal
5153

5254
Install GraalVM from an archive (_.tar.gz_) for the current user into any location, without affecting other JDK installations.
5355

54-
1. Navigate to the [GraalVM Downloads page](https://www.graalvm.org/downloads/){:target="_blank"}. Select the Java version, **macOS** for the operating system, **x64** or **aarch64** for the architecture, and download.
55-
56+
1. Navigate to the [GraalVM Downloads page](https://www.graalvm.org/downloads/){:target="_blank"}. Select the Java version, **macOS** for the operating system, **aarch64** for the architecture, and download.
57+
5658
2. Unzip the archive.
59+
5760
```bash
5861
tar -xzf graalvm-jdk-<version>_macos-<architecture>.tar.gz
5962
```
63+
6064
Alternatively, open the file in Finder.
6165

6266
3. Move the downloaded package to its proper location, the _/Library/Java/JavaVirtualMachines/_ directory. Since this is a system directory, `sudo` is required:
67+
6368
```bash
6469
sudo mv graalvm-jdk-<version> /Library/Java/JavaVirtualMachines
6570
```
71+
6672
To verify that the move is successful and to get a list of all installed JDKs, run `/usr/libexec/java_home -V`.
6773

6874
4. There can be multiple JDKs installed on the machine. The next step is to configure the runtime environment:
75+
6976
- Set the `JAVA_HOME` environment variable to resolve to the GraalVM installation directory:
77+
7078
```bash
7179
export JAVA_HOME=/Library/Java/JavaVirtualMachines/<graalvm>/Contents/Home
7280
```
81+
7382
- Set the value of the `PATH` environment variable to the GraalVM _bin/_ directory:
83+
7484
```bash
7585
export PATH=/Library/Java/JavaVirtualMachines/<graalvm>/Contents/Home/bin:$PATH
7686
```
@@ -80,8 +90,9 @@ Optionally, you can specify GraalVM as the default JRE or JDK installation in yo
8090

8191
## Script-Friendly URLs
8292

83-
Script-friendly URLs enable you to download GraalVM from a command line, or automatically in your script and Dockerfile by using a download URL.
84-
Substitute `<version>` and `<architecture>` with the JDK version and `aarch64` or `x64` architecture.
93+
Script-friendly URLs enable you to download GraalVM from a command line, or automatically in your script and Dockerfile by using a download URL.
94+
Substitute `<version>` with the JDK version. Only `aarch64` architecture is supported on macOS.
95+
8596
```bash
8697
# Download with wget
8798
wget https://download.oracle.com/graalvm/<version>/latest/graalvm-jdk-<version>_macos-<architecture>_bin.tar.gz
@@ -98,7 +109,9 @@ For other installation options, visit the [GraalVM Downloads page](https://www.g
98109
## Prerequisites for Native Image on macOS
99110

100111
Native Image requires the Xcode command line tools.
112+
101113
To install them, run:
114+
102115
```shell
103116
xcode-select --install
104117
```

docs/oracle-graalvm/support.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permalink: /support/
1010
Oracle GraalVM 25 is based on Oracle JDK 25.
1111
Each release of Oracle GraalVM 25 includes all Oracle Java critical patch updates (CPUs), which are provided on a regular schedule to remedy defects and known vulnerabilities.
1212

13-
Oracle GraalVM 25 is available for Linux, macOS, and Windows on the x64 architecture, and for Linux and macOS on the AArch64 architecture.
13+
Oracle GraalVM 25 is available for Linux and Windows on the x64 architecture, and for Linux and macOS on the AArch64 architecture.
1414

1515
## Certified Platforms
1616

@@ -35,9 +35,9 @@ Oracle GraalVM 25 is certified on the following platforms:
3535

3636
| Platform | CPU Architecture(s) |
3737
|----------|---------------------|
38-
| macOS 15 | AArch64, x64 |
39-
| macOS 14 | AArch64, x64 |
40-
| macOS 13 | AArch64, x64 |
38+
| macOS 15 | AArch64 |
39+
| macOS 14 | AArch64 |
40+
| macOS 13 | AArch64 |
4141

4242
**Windows**
4343

docs/reference-manual/embedding/embed-languages.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,6 @@ For example, to configure a dependency on isolated Python for Linux amd64, add t
714714
Supported platform classifiers are:
715715
* `linux-amd64`
716716
* `linux-aarch64`
717-
* `darwin-amd64`
718717
* `darwin-aarch64`
719718
* `windows-amd64`
720719

docs/reference-manual/java-on-truffle/FAQ.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ In the GraalVM family, this is similar to WebAssembly or the LLVM interpreter: w
1717
### Does Java running on Truffle run on the HotSpot JVM too?
1818

1919
Like other languages implemented with the [Truffle framework](../../../truffle/docs/README.md), it can run both as a native executable or on the HotSpot JVM.
20-
Running on the HotSpot JVM is currently only possible on Linux x64 and macOS x64.
20+
Running on the HotSpot JVM is currently only possible on Linux x64.
2121
We plan to extend this capability to other platforms.
2222

2323
### Does running Espresso require the HotSpot JVM?

docs/reference-manual/java-on-truffle/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ You can download a standalone based on Oracle GraalVM or GraalVM Community Editi
3737

3838
* [Linux x64](https://gds.oracle.com/download/espresso/archive/espresso-java25-25.0.0-linux-amd64.tar.gz)
3939
* [Linux AArch64](https://gds.oracle.com/download/espresso/archive/espresso-java25-25.0.0-linux-aarch64.tar.gz)
40-
* [macOS x64](https://gds.oracle.com/download/espresso/archive/espresso-java25-25.0.0-macos-amd64.tar.gz)
4140
* [macOS AArch64](https://gds.oracle.com/download/espresso/archive/espresso-java25-25.0.0-macos-aarch64.tar.gz)
4241
* [Windows x64](https://gds.oracle.com/download/espresso/archive/espresso-java25-25.0.0-windows-amd64.zip)
4342

docs/reference-manual/llvm/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,11 @@ You can download a standalone based on Oracle GraalVM or GraalVM Community Editi
2222
- Native standalone
2323
* [Linux x64](https://gds.oracle.com/download/llvm/archive/llvm-25.0.0-linux-amd64.tar.gz)
2424
* [Linux AArch64](https://gds.oracle.com/download/llvm/archive/llvm-25.0.0-linux-aarch64.tar.gz)
25-
* [macOS x64](https://gds.oracle.com/download/llvm/archive/llvm-25.0.0-macos-amd64.tar.gz)
2625
* [macOS AArch64](https://gds.oracle.com/download/llvm/archive/llvm-25.0.0-macos-aarch64.tar.gz)
2726
* [Windows x64](https://gds.oracle.com/download/llvm/archive/llvm-25.0.0-windows-amd64.zip)
2827
- JVM standalone
2928
* [Linux x64](https://gds.oracle.com/download/llvm/archive/llvm-jvm-25.0.0-linux-amd64.tar.gz)
3029
* [Linux AArch64](https://gds.oracle.com/download/llvm/archive/llvm-jvm-25.0.0-linux-aarch64.tar.gz)
31-
* [macOS x64](https://gds.oracle.com/download/llvm/archive/llvm-jvm-25.0.0-macos-amd64.tar.gz)
3230
* [macOS AArch64](https://gds.oracle.com/download/llvm/archive/llvm-jvm-25.0.0-macos-aarch64.tar.gz)
3331
* [Windows x64](https://gds.oracle.com/download/llvm/archive/llvm-jvm-25.0.0-windows-amd64.zip)
3432

docs/reference-manual/native-image/FFM-API.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ These two kinds of calls are referred to as "downcalls" and "upcalls", respectiv
2727
> Currently supported platforms for downcalls and upcalls are:
2828
>
2929
> * Linux/x64
30-
> * macOS/x64
3130
> * Windows/x64
3231
> * macOS/AArch64
3332
> * Linux/AArch64

0 commit comments

Comments
 (0)