Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/actions/setup-ocaml/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@ runs:
platform=aarch64-linux
checksum=ba991f677edd9a21d2bc96c0144bc8ac5b112d4d98a3eb266e075e22e557df2a
;;
macOS-X64)
platform=x86_64-macos
checksum=d209fadd8a894bdaf3bd3612a23c32a0af184d2f4a979b8c789e6e4f6a4de883
;;
macOS-ARM64)
platform=arm64-macos
checksum=e441b48dc22163d209b4f05e44dc7210909b01237642b6c9ae48fd710a3ef83e
Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,6 @@ jobs:
node-target: linux-arm64
rust-target: aarch64-unknown-linux-musl
dune-profile: static
- os: macos-26-intel # x64
ocaml_compiler: 5.5.1
upload_binaries: true
node-target: darwin-x64
rust-target: x86_64-apple-darwin
dune-profile: release
- os: macos-26 # ARM
ocaml_compiler: 5.5.1
upload_binaries: true
Expand Down Expand Up @@ -537,7 +531,6 @@ jobs:
fail-fast: false
matrix:
include:
- os: macos-26-intel
- os: macos-26
- os: ubuntu-26.04
- os: ubuntu-26.04-arm
Expand Down Expand Up @@ -603,7 +596,6 @@ jobs:
fail-fast: false
matrix:
include:
- os: macos-26-intel
- os: macos-26
- os: ubuntu-26.04
- os: ubuntu-26.04-arm
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/moveArtifacts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ mv lib-ocaml packages/@rescript/runtime/lib/ocaml

# @rescript/{target}
chmod +x binaries-*/*.exe
mv -f binaries-darwin-x64/* "packages/@rescript/darwin-x64/bin"
mv -f binaries-darwin-arm64/* "packages/@rescript/darwin-arm64/bin"
mv -f binaries-linux-x64/* "packages/@rescript/linux-x64/bin"
mv -f binaries-linux-arm64/* "packages/@rescript/linux-arm64/bin"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ else ifeq ($(UNAME_S),Darwin)
ifeq ($(UNAME_M),arm64)
RESCRIPT_PLATFORM := darwin-arm64
else
RESCRIPT_PLATFORM := darwin-x64
$(error Intel Macs are not supported anymore, use ReScript 12)
endif
else ifeq ($(UNAME_S),Linux)
ifeq ($(UNAME_M),aarch64)
Expand Down
1 change: 1 addition & 0 deletions changes/drop-macos-intel.breaking.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Drop support for macOS on Intel (darwin-x64). Intel Mac users can stay on ReScript 12.
6 changes: 2 additions & 4 deletions cli/common/bins.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,14 @@

const os = require("node:os");
const path = require("node:path");
const { getTarget } = require("./platform.cjs");
const { getTarget, unsupportedPlatformMessage } = require("./platform.cjs");

const minimumNodeVersion = "22.0.0";

const target = getTarget(process.platform, process.arch, os.release());

if (target === undefined) {
throw new Error(
`Platform ${process.platform}-${process.arch} is not supported!`,
);
throw new Error(unsupportedPlatformMessage(process.platform, process.arch));
}

const binPackageName = `@rescript/${target}`;
Expand Down
14 changes: 13 additions & 1 deletion cli/common/platform.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

const supportedTargets = [
"darwin-arm64",
"darwin-x64",
"linux-arm64",
"linux-x64",
"win32-x64",
Expand All @@ -32,6 +31,18 @@ function getTarget(platform, arch, osRelease) {
return supportedTargets.includes(target) ? target : undefined;
}

/**
* @param {string} platform `process.platform`
* @param {string} arch `process.arch`
* @returns {string} the error for a platform without a target
*/
function unsupportedPlatformMessage(platform, arch) {
if (platform === "darwin" && arch === "x64") {
return "Intel Macs are not supported anymore. Use ReScript 12.";
}
return `Platform ${platform}-${arch} is not supported!`;
}

/**
* @param {string} osRelease
*/
Expand All @@ -41,3 +52,4 @@ function windowsBuild(osRelease) {
}

exports.getTarget = getTarget;
exports.unsupportedPlatformMessage = unsupportedPlatformMessage;
27 changes: 0 additions & 27 deletions compiler/sync/dune
Original file line number Diff line number Diff line change
Expand Up @@ -39,33 +39,6 @@
(run strip -o rescript-tools.exe ../../tools/bin/main.exe)
(run strip -o rescript.exe ../../rewatch-ocaml/rescript_ocaml.exe))))

(rule
(enabled_if
(and
(<> %{profile} browser)
(= %{system} macosx)
(= %{architecture} amd64)))
(targets
bsc.exe
rescript-editor-analysis.exe
rescript-tools.exe
rescript.exe)
(deps
../bsc/rescript_compiler_main.exe
../../analysis/bin/main.exe
../../tools/bin/main.exe
../../rewatch-ocaml/rescript_ocaml.exe)
(mode
(promote
(until-clean)
(into ../../packages/@rescript/darwin-x64/bin)))
(action
(progn
(run strip -o bsc.exe ../bsc/rescript_compiler_main.exe)
(run strip -o rescript-editor-analysis.exe ../../analysis/bin/main.exe)
(run strip -o rescript-tools.exe ../../tools/bin/main.exe)
(run strip -o rescript.exe ../../rewatch-ocaml/rescript_ocaml.exe))))

(rule
(enabled_if
(and
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@
},
"optionalDependencies": {
"@rescript/darwin-arm64": "workspace:packages/@rescript/darwin-arm64",
"@rescript/darwin-x64": "workspace:packages/@rescript/darwin-x64",
"@rescript/linux-arm64": "workspace:packages/@rescript/linux-arm64",
"@rescript/linux-x64": "workspace:packages/@rescript/linux-x64",
"@rescript/win32-x64": "workspace:packages/@rescript/win32-x64"
Expand Down
Loading
Loading