From b92a6c6fa55d1ca3127da8232a7c69c42768756e Mon Sep 17 00:00:00 2001 From: kirkrodrigues <2454684+kirkrodrigues@users.noreply.github.com> Date: Tue, 29 Oct 2024 16:49:04 -0400 Subject: [PATCH] ci: Switch GitHub macOS build workflow to use macos-13 (x86) and macos-14 (ARM) runners. (#566) --- .github/workflows/clp-core-build-macos.yaml | 9 +++++---- .github/workflows/clp-core-build.yaml | 4 ++-- .../lib_install/{macos-12 => macos}/install-all.sh | 0 docs/src/dev-guide/components-core/index.md | 4 ++-- .../{macos12-deps-install.md => macos-deps-install.md} | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-) rename components/core/tools/scripts/lib_install/{macos-12 => macos}/install-all.sh (100%) rename docs/src/dev-guide/components-core/{macos12-deps-install.md => macos-deps-install.md} (85%) diff --git a/.github/workflows/clp-core-build-macos.yaml b/.github/workflows/clp-core-build-macos.yaml index dfcc46d31..85d04d9c7 100644 --- a/.github/workflows/clp-core-build-macos.yaml +++ b/.github/workflows/clp-core-build-macos.yaml @@ -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" @@ -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" @@ -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: @@ -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" diff --git a/.github/workflows/clp-core-build.yaml b/.github/workflows/clp-core-build.yaml index 9cec1fc2b..9046f15da 100644 --- a/.github/workflows/clp-core-build.yaml +++ b/.github/workflows/clp-core-build.yaml @@ -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" @@ -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: diff --git a/components/core/tools/scripts/lib_install/macos-12/install-all.sh b/components/core/tools/scripts/lib_install/macos/install-all.sh similarity index 100% rename from components/core/tools/scripts/lib_install/macos-12/install-all.sh rename to components/core/tools/scripts/lib_install/macos/install-all.sh diff --git a/docs/src/dev-guide/components-core/index.md b/docs/src/dev-guide/components-core/index.md index 36fdad548..1406f1bd2 100644 --- a/docs/src/dev-guide/components-core/index.md +++ b/docs/src/dev-guide/components-core/index.md @@ -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) @@ -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 diff --git a/docs/src/dev-guide/components-core/macos12-deps-install.md b/docs/src/dev-guide/components-core/macos-deps-install.md similarity index 85% rename from docs/src/dev-guide/components-core/macos12-deps-install.md rename to docs/src/dev-guide/components-core/macos-deps-install.md index f1b8a704b..58483a437 100644 --- a/docs/src/dev-guide/components-core/macos12-deps-install.md +++ b/docs/src/dev-guide/components-core/macos-deps-install.md @@ -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]. @@ -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