Skip to content

Commit

Permalink
ci: Switch GitHub macOS build workflow to use macos-13 (x86) and maco…
Browse files Browse the repository at this point in the history
…s-14 (ARM) runners. (#566)
  • Loading branch information
kirkrodrigues authored Oct 29, 2024
1 parent 829013b commit b92a6c6
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 10 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/clp-core-build-macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- "components/core/CMakeLists.txt"
- "components/core/src/**"
- "components/core/tests/**"
- "components/core/tools/scripts/lib_install/macos-12/**"
- "components/core/tools/scripts/lib_install/macos/**"
- "components/core/tools/scripts/deps-download/**"
- "components/core/tools/scripts/utils/build-and-run-unit-tests.py"
- "deps-tasks.yml"
Expand All @@ -21,7 +21,7 @@ on:
- "components/core/CMakeLists.txt"
- "components/core/src/**"
- "components/core/tests/**"
- "components/core/tools/scripts/lib_install/macos-12/**"
- "components/core/tools/scripts/lib_install/macos/**"
- "components/core/tools/scripts/deps-download/**"
- "components/core/tools/scripts/utils/build-and-run-unit-tests.py"
- "deps-tasks.yml"
Expand All @@ -38,8 +38,9 @@ jobs:
build-macos:
strategy:
matrix:
runner: ["macos-13", "macos-14"]
use_shared_libs: [true, false]
runs-on: "macos-12"
runs-on: "${{matrix.runner}}"
steps:
- uses: "actions/checkout@v4"
with:
Expand All @@ -55,7 +56,7 @@ jobs:
rm -f /usr/local/bin/python3*
- name: "Install dependencies"
run: "./components/core/tools/scripts/lib_install/macos-12/install-all.sh"
run: "./components/core/tools/scripts/lib_install/macos/install-all.sh"

- run: "./tools/scripts/deps-download/init.sh"
shell: "bash"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/clp-core-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
- "deps-tasks.yml"
- "Taskfile.yml"
- "tools/scripts/deps-download/**"
- "!components/core/tools/scripts/lib_install/macos-12/**"
- "!components/core/tools/scripts/lib_install/macos/**"
push:
paths:
- ".github/actions/clp-core-build/action.yaml"
Expand All @@ -22,7 +22,7 @@ on:
- "deps-tasks.yml"
- "Taskfile.yml"
- "tools/scripts/deps-download/**"
- "!components/core/tools/scripts/lib_install/macos-12/**"
- "!components/core/tools/scripts/lib_install/macos/**"
workflow_dispatch:

env:
Expand Down
4 changes: 2 additions & 2 deletions docs/src/dev-guide/components-core/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ A handful of packages and libraries are required to build CLP. There are two opt
See the relevant README for your OS:

* [CentOS Stream 9](centos-stream-9-deps-install)
* [macOS 12](macos12-deps-install)
* [macOS](macos-deps-install)
* [Ubuntu 20.04](ubuntu-focal-deps-install)
* [Ubuntu 22.04](ubuntu-jammy-deps-install)

Expand Down Expand Up @@ -98,7 +98,7 @@ the relevant paths on your machine.
:hidden:

centos-stream-9-deps-install
macos12-deps-install
macos-deps-install
ubuntu-focal-deps-install
ubuntu-jammy-deps-install
regex-utils
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# macOS 12 setup
# macOS setup

To install the dependencies required to build clp-core, follow the steps below.
These same steps are used by our [GitHub workflow][gh-workflow].
Expand All @@ -13,7 +13,7 @@ will not install any dependencies you don't expect.
To install all dependencies, run:

```shell
components/core/tools/scripts/lib_install/macos-12/install-all.sh
components/core/tools/scripts/lib_install/macos/install-all.sh
```

[gh-workflow]: https://github.com/y-scope/clp/blob/main/.github/workflows/clp-core-build-macos.yaml

0 comments on commit b92a6c6

Please sign in to comment.