diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 601f939783..e6bc1a7309 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -1,4 +1,4 @@ -name: MacOS +name: macOS on: push: @@ -28,7 +28,7 @@ jobs: run: brew install automake autoconf libtool pkg-config - name: Install gperf, bison and flex - # Mac OS has ancient versions of bison and flex, so we need a newer from + # macOS has ancient versions of bison and flex, so we need a newer from # Homebrew. The new versions are installed keg-only, so we must tell # configure/make where to look. Adjusting $PATH doesn't work (maybe # because make invokes the two via ylwrap), so instead symlink the two @@ -50,13 +50,13 @@ jobs: cd .. - name: Install other dependencies - # libxml2 is included with Mac OS + # libxml2 is included with macOS run: | brew install libunistring confuse libplist libwebsockets libevent libgcrypt json-c protobuf-c libsodium gnutls pulseaudio openssl ffmpeg sqlite - name: Configure # We configure a non-privileged setup, since how to add a "owntone" system - # user in MacOS isn't clear to me (useradd etc. isn't available) + # user in macOS isn't clear to me (useradd etc. isn't available) run: | export CFLAGS="-I$(brew --prefix)/include -I$(brew --prefix sqlite)/include" export LDFLAGS="-L$(brew --prefix)/lib -L$(brew --prefix sqlite)/lib" diff --git a/.github/workflows/macos_12.yml b/.github/workflows/macos_12.yml index 6253202acf..c4f40c4132 100644 --- a/.github/workflows/macos_12.yml +++ b/.github/workflows/macos_12.yml @@ -1,4 +1,4 @@ -name: MacOS 12 +name: macOS 12 on: workflow_dispatch: @@ -14,7 +14,7 @@ jobs: run: brew install automake autoconf libtool pkg-config - name: Install gperf, bison and flex - # MacOS comes with an ancient bison, we need a newer version. Homebrew's + # macOS comes with an ancient bison, we need a newer version. Homebrew's # bison and flex are keg-only, which means they are not symlinked into # /usr/local because macOS already provides this software. Homebrew tells # you to adjust the $PATH, but I couldn't make that work, and I think @@ -60,7 +60,7 @@ jobs: - name: Configure # We configure a non-privileged setup, since how to add a "owntone" system - # user in MacOS isn't clear to me (useradd etc. isn't available) + # user in macOS isn't clear to me (useradd etc. isn't available) run: | autoreconf -fi ./configure --prefix=$HOME/owntone_data/usr --sysconfdir=$HOME/owntone_data/etc --localstatedir=$HOME/owntone_data/var --enable-chromecast --with-pulseaudio