From 6fe37ba0de5613644703799da620ec721bbfa55f Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Fri, 12 May 2023 17:15:39 +0200
Subject: [PATCH] Rename osx to macos.

---
 .github/scripts/build_definition.py      | 18 +++++++++---------
 .github/scripts/build_projects.py        |  2 +-
 .github/scripts/build_release_nightly.py |  4 ++--
 .github/scripts/common.py                |  2 +-
 .github/workflows/ci.yml                 |  2 +-
 .github/workflows/releaseNigthly.yml     |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/scripts/build_definition.py b/.github/scripts/build_definition.py
index 82901f0..b902abe 100644
--- a/.github/scripts/build_definition.py
+++ b/.github/scripts/build_definition.py
@@ -17,15 +17,15 @@ BUILD_DEF = """
     | bionic  |                    | B      |          |           |             |               |
     ----------------------------------------------------------------------------------------------
 # Osx builds, build binaries on native_dyn and native_static. On anyother things, build only the libraries
-    | osx     | native_dyn         | d      | d        | dB        | B           |               |
-    | osx     | native_static      |        |          | B         | B           |               |
-    | osx     | native_mixed       | B      | B        |           |             |               |
-    | osx     | iOS_arm64          | dB     | B        |           |             |               |
-    | osx     | iOS_x86_64         | dB     | B        |           |             |               |
-    | osx     | iOS_Mac_ABI        | B      | B        |           |             |               |
-    | osx     | macOS_arm64_static | B      | B        |           |             |               |
-    | osx     | macOS_arm64_mixed  | B      | B        |           |             |               |
-    | osx     | macOS_x86_64       | B      | B        |           |             |               |
+    | macos   | native_dyn         | d      | d        | dB        | B           |               |
+    | macos   | native_static      |        |          | B         | B           |               |
+    | macos   | native_mixed       | B      | B        |           |             |               |
+    | macos   | iOS_arm64          | dB     | B        |           |             |               |
+    | macos   | iOS_x86_64         | dB     | B        |           |             |               |
+    | macos   | iOS_Mac_ABI        | B      | B        |           |             |               |
+    | macos   | macOS_arm64_static | B      | B        |           |             |               |
+    | macos   | macOS_arm64_mixed  | B      | B        |           |             |               |
+    | macos   | macOS_x86_64       | B      | B        |           |             |               |
     ----------------------------------------------------------------------------------------------
     |         | flatpak            |        |          |           |             | B             |
     |         | native_static      | d      | d        | dB        | dB          |               |
diff --git a/.github/scripts/build_projects.py b/.github/scripts/build_projects.py
index 5e5b659..b267b64 100755
--- a/.github/scripts/build_projects.py
+++ b/.github/scripts/build_projects.py
@@ -17,7 +17,7 @@ for target in select_build_targets(BUILD):
     if target == "kiwix-desktop":
         archive = create_desktop_image(make_release=False)
     else:
-        if PLATFORM_TARGET == "native_mixed" and OS_NAME == "osx":
+        if PLATFORM_TARGET == "native_mixed" and OS_NAME == "macos":
             fix_macos_rpath(target)
         archive = make_archive(target, make_release=False)
     if archive and DEV_BRANCH:
diff --git a/.github/scripts/build_release_nightly.py b/.github/scripts/build_release_nightly.py
index a35c2ab..f320544 100755
--- a/.github/scripts/build_release_nightly.py
+++ b/.github/scripts/build_release_nightly.py
@@ -34,7 +34,7 @@ for target in TARGETS:
     if target == "kiwix-desktop":
         archive = create_desktop_image(make_release=MAKE_RELEASE)
     else:
-        if OS_NAME == "osx" and PLATFORM_TARGET.endswith("_mixed"):
+        if OS_NAME == "macos" and PLATFORM_TARGET.endswith("_mixed"):
             fix_macos_rpath(target)
             notarize_macos_build(target)
         archive = make_archive(target, make_release=MAKE_RELEASE)
@@ -46,7 +46,7 @@ for target in TARGETS:
 # We have few more things to do for release:
 if MAKE_RELEASE:
     # Publish source archives
-    if PLATFORM_TARGET in ("native_dyn", "native_mixed") and OS_NAME != "osx":
+    if PLATFORM_TARGET in ("native_dyn", "native_mixed") and OS_NAME != "macos":
         for target in TARGETS:
             if release_versions.get(target) != 0:
                 continue
diff --git a/.github/scripts/common.py b/.github/scripts/common.py
index 22eb754..f483291 100644
--- a/.github/scripts/common.py
+++ b/.github/scripts/common.py
@@ -36,7 +36,7 @@ if not MAKE_RELEASE and _ref != "main":
 else:
     DEV_BRANCH = None
 
-RELEASE_OS_NAME = "macos" if OS_NAME == "osx" else "linux"
+RELEASE_OS_NAME = "macos" if OS_NAME == "macos" else "linux"
 EXTRA_NAME = "-bionic" if OS_NAME == "bionic" else ""
 
 PLATFORM_TO_RELEASE = {
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 43b2edf..d35f98a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -150,7 +150,7 @@ jobs:
     runs-on: macos-11
     env:
       SSH_KEY: /tmp/id_rsa
-      OS_NAME: osx
+      OS_NAME: macos
     steps:
     - name: Checkout code
       uses: actions/checkout@v3
diff --git a/.github/workflows/releaseNigthly.yml b/.github/workflows/releaseNigthly.yml
index 46398ff..3791f36 100644
--- a/.github/workflows/releaseNigthly.yml
+++ b/.github/workflows/releaseNigthly.yml
@@ -168,7 +168,7 @@ jobs:
     runs-on: macos-11
     env:
       SSH_KEY: /tmp/id_rsa
-      OS_NAME: osx
+      OS_NAME: macos
       CERTIFICATE: /tmp/wmch-devid.p12
       SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
       KEYCHAIN: /Users/runner/build.keychain-db