From 15ce9be79a28c690a62fd90bb6d30515e4dc3de5 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Sun, 14 Aug 2022 16:00:19 -0700 Subject: [PATCH] Update macOS dependency tarball instructions for the existence of Apple Silicon. --- util/ci/macos-ci-deps/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/ci/macos-ci-deps/README.md b/util/ci/macos-ci-deps/README.md index 1249442649..f241162893 100644 --- a/util/ci/macos-ci-deps/README.md +++ b/util/ci/macos-ci-deps/README.md @@ -3,7 +3,7 @@ For creating the macOS dependency tarball required by the Github CI tests. Requirements: * Administrator privs on your Mac. * Project admin privs for https://sourceforge.net/projects/gnucash. -* You must be running the same or newer version of macOS as the Github runner. +* Jhbuild doesn't cross-compile well so you need a mac with the same architecture as the github VM. Check [here](https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources) for the current configuration. At the time of this writing it's x86_64. * Xcode or command-line tools (install the latter with `sudo xcode-select -install`). To build this tarball you must be running the same or newer macOS version as the Github VM. @@ -11,7 +11,7 @@ Procedure: * Set up a Gtk-OSX build environment following the [GnuCash Quartz Build instructions](https://wiki.gnucash.org/wiki/MacOS/Quartz). * Retrieve [jhbuildrc-custom](https://github.com/gnucash/gnucash-on-osx/jhbuildrc-custom) and put it in ~/.config. * Set `modules = _modules_deps` on the appropriate line of `jhbuildrc-custom`. -* If you are not running the same version of macOS as the Github actions virtual environment change the `setup_SDK()` line at the bottom of `jhbuildrc-custom` to `setup_SDK('10.15')`, substituting the VM's macOS version for '10.15'. +* If you are running a newer version of macOS than the Github actions virtual environment change the `setup_SDK()` line at the bottom of `jhbuildrc-custom` to `setup_SDK('11')`, substituting the VM's macOS version for '11'. * Create the directory `/Users/runner/` and make yourself the owner: ``` sudo mkdir /Users/runner