Skip to content

Commit

Permalink
Merge pull request #491 from evo-lua/macos-naming-consistency
Browse files Browse the repository at this point in the history
Use the fancy new-fangled macOS name consistently (instead of the "good old" Mac OS X)
  • Loading branch information
rdw-software authored Feb 9, 2024
2 parents 3d60cbc + 395ca61 commit a9212d4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-mac.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build and Release (Mac OS)
name: Build and Release (macOS)

on:
push:
Expand All @@ -23,7 +23,7 @@ concurrency:
jobs:
build:
if: github.event.pull_request.draft == false
name: Build for Mac OS
name: Build for macOS
runs-on: ${{ matrix.os }}
strategy:
matrix:
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ Not all of the included APIs are as user-friendly as I'd like, but that'll chang

## System Requirements

The supported platforms are current versions of Windows, Linux, and Mac OS X.
The supported platforms are current versions of Windows, Linux, and macOS.

Automated testing covers all platforms equally:

![https://github.com/evo-lua/evo-runtime/actions/workflows/ci-windows.yml/badge.svg](https://github.com/evo-lua/evo-runtime/actions/workflows/ci-windows.yml/badge.svg)
![https://github.com/evo-lua/evo-runtime/actions/workflows/ci-linux.yml/badge.svg](https://github.com/evo-lua/evo-runtime/actions/workflows/ci-linux.yml/badge.svg)
![https://github.com/evo-lua/evo-runtime/actions/workflows/ci-mac.yml/badge.svg](https://github.com/evo-lua/evo-runtime/actions/workflows/ci-mac.yml/badge.svg)

Development happens on Windows 10 and Ubuntu. Mac OS support is given on a "best effort" basis.
Development happens on Windows 10 and Ubuntu; macOS (especially M1) support is given on a "best effort" basis.

## Compatibility

Expand Down Expand Up @@ -57,7 +57,7 @@ In this repository, you'll find the following important directories:
After building, you'll additionally find a temporary directory containing all build artifacts here:

* ``ninjabuild-windows`` (Windows)
* ``ninjabuild-unix`` (Linux or Mac OS)
* ``ninjabuild-unix`` (Linux or macOS)

There's also config files for GitHub actions and other tooling in the project root - a necessary evil.

Expand Down

0 comments on commit a9212d4

Please sign in to comment.