From 73787b1824c12c5aa73c875b6321b0a0e7f885be Mon Sep 17 00:00:00 2001
From: Kenjiro Nakayama <nakayamakenjiro@gmail.com>
Date: Thu, 21 Mar 2024 19:05:27 +0900
Subject: Run tests for macos-14 on arm64

macos-12 and macos-13 fails `make test` on arm64 but macos-14 does not.
Hence this patch enables it on github action.
---
 .github/workflows/macos.yml | 1 +
 scripts/test                | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index f570f19..cd52d2c 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -34,3 +34,4 @@ jobs:
       run: ./scripts/test
       env:
         ARCH: "${{ matrix.arch }}"
+        OS: "${{ matrix.os }}"
diff --git a/scripts/test b/scripts/test
index 97e316e..d093eab 100755
--- a/scripts/test
+++ b/scripts/test
@@ -34,7 +34,9 @@ if [ `uname` = "Darwin" ]; then
 		cd build-static
 		cmake -DCMAKE_OSX_ARCHITECTURES=$ARCH ..
 		make -j 4
-		if [ "$ARCH" = "x86_64" ]; then
+		if [ "$ARCH" = "arm64" ] && [ "$OS" = "macos-12" ] || [ "$OS" = "macos-13" ]; then
+			echo "##### skip tests"
+		else
 			make test
 		fi
 	)
@@ -44,7 +46,9 @@ if [ `uname` = "Darwin" ]; then
 		cd build-shared
 		cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_OSX_ARCHITECTURES=$ARCH ..
 		make -j 4
-		if [ "$ARCH" = "x86_64" ]; then
+		if [ "$ARCH" = "arm64" ] && [ "$OS" = "macos-12" ] || [ "$OS" = "macos-13" ]; then
+			echo "##### skip tests"
+		else
 			make test
 		fi
 	)
-- 
cgit v1.2.3-55-g6feb


From 51e6f0ec5a9e3c68ec610d47d6a915b61e8f6a85 Mon Sep 17 00:00:00 2001
From: Kenjiro Nakayama <nakayamakenjiro@gmail.com>
Date: Fri, 22 Mar 2024 09:24:49 +0900
Subject: Split the jobs into two files, macOS and macOS-legacy.

---
 .github/workflows/macos-legacy.yml | 37 +++++++++++++++++++++++++++++++++++++
 .github/workflows/macos.yml        |  2 +-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/macos-legacy.yml

diff --git a/.github/workflows/macos-legacy.yml b/.github/workflows/macos-legacy.yml
new file mode 100644
index 0000000..f263423
--- /dev/null
+++ b/.github/workflows/macos-legacy.yml
@@ -0,0 +1,37 @@
+# GitHub Actions workflow to run tests on macOS.
+name: "macOS-legacy"
+
+on:
+  push: {}
+  pull_request: {}
+  schedule:
+    - cron: "0 0 * * 0" # At 00:00 weekly on Sunday.
+
+concurrency:
+  group: "${{ github.workflow }}-${{ github.ref }}"
+  cancel-in-progress: true
+
+jobs:
+  test:
+    name: "${{ matrix.os }}/${{ matrix.arch }}"
+    runs-on: "${{ matrix.os }}"
+    if: ${{ github.repository_owner == 'libressl' || github.event_name != 'schedule' }}
+    permissions:
+      contents: read
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ["macos-13", "macos-12"]
+        arch: ["arm64", "x86_64"]
+    steps:
+    - name: "Install required packages"
+      run: brew install automake
+
+    - name: "Checkout repository"
+      uses: actions/checkout@v4
+
+    - name: "Run tests"
+      run: ./scripts/test
+      env:
+        ARCH: "${{ matrix.arch }}"
+        OS: "${{ matrix.os }}"
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index cd52d2c..7874521 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ["macos-14", "macos-13", "macos-12"]
+        os: ["macos-14"]
         arch: ["arm64", "x86_64"]
     steps:
     - name: "Install required packages"
-- 
cgit v1.2.3-55-g6feb


From adc4d4332cb33a8630b9c6aa2d58c14a6b45c86d Mon Sep 17 00:00:00 2001
From: Kenjiro Nakayama <nakayamakenjiro@gmail.com>
Date: Mon, 25 Mar 2024 15:51:24 +0900
Subject: Revert "Split the jobs into two files, macOS and macOS-legacy."

This reverts commit 51e6f0ec5a9e3c68ec610d47d6a915b61e8f6a85.
---
 .github/workflows/macos-legacy.yml | 37 -------------------------------------
 .github/workflows/macos.yml        |  2 +-
 2 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 .github/workflows/macos-legacy.yml

diff --git a/.github/workflows/macos-legacy.yml b/.github/workflows/macos-legacy.yml
deleted file mode 100644
index f263423..0000000
--- a/.github/workflows/macos-legacy.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-# GitHub Actions workflow to run tests on macOS.
-name: "macOS-legacy"
-
-on:
-  push: {}
-  pull_request: {}
-  schedule:
-    - cron: "0 0 * * 0" # At 00:00 weekly on Sunday.
-
-concurrency:
-  group: "${{ github.workflow }}-${{ github.ref }}"
-  cancel-in-progress: true
-
-jobs:
-  test:
-    name: "${{ matrix.os }}/${{ matrix.arch }}"
-    runs-on: "${{ matrix.os }}"
-    if: ${{ github.repository_owner == 'libressl' || github.event_name != 'schedule' }}
-    permissions:
-      contents: read
-    strategy:
-      fail-fast: false
-      matrix:
-        os: ["macos-13", "macos-12"]
-        arch: ["arm64", "x86_64"]
-    steps:
-    - name: "Install required packages"
-      run: brew install automake
-
-    - name: "Checkout repository"
-      uses: actions/checkout@v4
-
-    - name: "Run tests"
-      run: ./scripts/test
-      env:
-        ARCH: "${{ matrix.arch }}"
-        OS: "${{ matrix.os }}"
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 7874521..cd52d2c 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ["macos-14"]
+        os: ["macos-14", "macos-13", "macos-12"]
         arch: ["arm64", "x86_64"]
     steps:
     - name: "Install required packages"
-- 
cgit v1.2.3-55-g6feb