Skip to content

CI: reactivate macos-arm builds #6114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 6, 2023
Merged

CI: reactivate macos-arm builds #6114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a571cb
Revert "Deactivate macos-arm builds for now: fix binDirName (#6107)"
cknitt Apr 6, 2023
45dd31e
Revert "Deactivate macos-arm builds for now"
cknitt Apr 6, 2023
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
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@ jobs:
strategy:
fail-fast: false
matrix:
# os: [macos-latest, ubuntu-latest, windows-latest, macos-arm]
os: [macos-latest, ubuntu-latest, windows-latest]
os: [macos-latest, ubuntu-latest, windows-latest, macos-arm]
ocaml_compiler: [4.14.0]

runs-on: ${{matrix.os}}
Expand Down Expand Up @@ -288,9 +287,10 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [
os:
[
macos-latest,
# macos-arm,
macos-arm,
ubuntu-latest,
buildjet-2vcpu-ubuntu-2204-arm,
windows-latest,
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"bsc",
"rescript",
"darwin",
"darwinarm64",
"linux",
"linuxarm64",
"win32",
Expand Down
4 changes: 4 additions & 0 deletions packages/artifacts.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ darwin/bsb_helper.exe
darwin/bsc.exe
darwin/ninja.exe
darwin/rescript.exe
darwinarm64/bsb_helper.exe
darwinarm64/bsc.exe
darwinarm64/ninja.exe
darwinarm64/rescript.exe
docs/docson/build-schema.json
lib/bstracing
lib/cmi_cache.bin
Expand Down
5 changes: 0 additions & 5 deletions scripts/bin_path.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@ var path = require("path");
var binDirName =
process.arch === "x64" ? process.platform : process.platform + process.arch;

// Deactivate support for macos-arm for now
if (binDirName === "darwinarm64") {
binDirName = "darwin";
}

/**
*
* @type{string}
Expand Down
3 changes: 1 addition & 2 deletions scripts/makeArtifactList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ if (isCheckMode) {
}

function getFilesAddedByCI() {
// const platforms = ["darwin", "darwinarm64", "linux", "win32"];
const platforms = ["darwin", "linux", "win32"];
const platforms = ["darwin", "darwinarm64", "linux", "win32"];
const exes = ["bsb_helper.exe", "bsc.exe", "ninja.exe", "rescript.exe"];

const files = ["ninja.COPYING"];
Expand Down
2 changes: 1 addition & 1 deletion scripts/moveArtifacts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e
chmod +x binaries-*/*.exe

mv binaries-darwin darwin
# mv binaries-darwinarm64 darwinarm64
mv binaries-darwinarm64 darwinarm64
mv binaries-linux linux
mv binaries-linuxarm64 linuxarm64
mv binaries-win32 win32
Expand Down