From 2fc8de43672b44757b8c09ec8ec1381729b47bc1 Mon Sep 17 00:00:00 2001
From: animetosho <animetosho@users.noreply.github.com>
Date: Sat, 30 Dec 2023 16:27:15 +1000
Subject: [PATCH] Try to get osxcross working on Ubuntu 22.04 20.04 only has
 Clang 10, which doesn't support the SHA3 extension

---
 .github/workflows/build-dev-mac-arm64.yml | 49 +++++++++++++++++++++++
 .github/workflows/build-dev.yml           | 10 ++++-
 .github/workflows/build.yml               | 10 ++++-
 3 files changed, 65 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/build-dev-mac-arm64.yml

diff --git a/.github/workflows/build-dev-mac-arm64.yml b/.github/workflows/build-dev-mac-arm64.yml
new file mode 100644
index 0000000..f7a1878
--- /dev/null
+++ b/.github/workflows/build-dev-mac-arm64.yml
@@ -0,0 +1,49 @@
+name: Build MacOS dev binary
+on:
+  workflow_dispatch:
+
+jobs:
+  build-test-mac-arm64:
+    name: Build arm64 MacOS binary
+    runs-on: ubuntu-22.04
+    steps:
+      # workaround issue with OpenSSL 3.0.2 on 22.04: https://github.com/tpoechtrager/osxcross/issues/349
+      # issue is fixed in 3.0.7, so grab 3.0.8 from Ubuntu 23.04
+      - run: |
+          echo 'deb http://archive.ubuntu.com/ubuntu/ lunar main' >>/etc/apt/sources.list.d/lunar.list
+          echo 'APT::Default-Release "jammy";' >>/etc/apt/apt.conf
+          apt update
+          apt -t=lunar -y install openssl
+      - uses: mbround18/setup-osxcross@main  # OSXCROSS_TARGET unavailable in v1.1
+        with:
+          osx-version: "12.3"
+      - uses: actions/checkout@v3
+      - run: aclocal && automake --warnings=all --add-missing && autoconf --warnings=all
+      - run: ./configure --host=aarch64-macos
+        env:
+          CC: oa64-clang
+          CXX: oa64-clang++
+          AR: arm64-apple-darwin21.4-ar
+          RANLIB: arm64-apple-darwin21.4-ranlib
+          STRIP: arm64-apple-darwin21.4-strip
+      - uses: actions/upload-artifact@v3
+        with:
+          path: ./config.log
+          name: configure-macos-arm64.log
+          retention-days: 5
+        if: ${{ failure() }}
+      - run: make
+      - run: |
+          wget -q -O- https://github.com/indygreg/apple-platform-rs/releases/download/apple-codesign%2F0.22.0/apple-codesign-0.22.0-x86_64-unknown-linux-musl.tar.gz | tar zxf -
+          apple-codesign*/rcodesign sign par2
+      - if: ${{ failure() }}
+        run: |
+          ls
+          ls apple-codesign*
+          find . -name rcodesign
+      - run: xz -9e --lzma2 par2
+      - uses: actions/upload-artifact@v3
+        with:
+          path: ./par2.xz
+          name: par2cmdline-turbo-dev-macos-arm64.xz
+          retention-days: 5
diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml
index 801ef3b..71f5446 100644
--- a/.github/workflows/build-dev.yml
+++ b/.github/workflows/build-dev.yml
@@ -172,9 +172,15 @@ jobs:
 
   build-dev-mac-arm64:
     name: Build arm64 MacOS binary
-    # avoid OpenSSL 3.0.2 on 22.04: https://github.com/tpoechtrager/osxcross/issues/349
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
+      # workaround issue with OpenSSL 3.0.2 on 22.04: https://github.com/tpoechtrager/osxcross/issues/349
+      # issue is fixed in 3.0.7, so grab 3.0.8 from Ubuntu 23.04
+      - run: |
+          echo 'deb http://archive.ubuntu.com/ubuntu/ lunar main' >>/etc/apt/sources.list.d/lunar.list
+          echo 'APT::Default-Release "jammy";' >>/etc/apt/apt.conf
+          apt update
+          apt -t=lunar -y install openssl
       - uses: mbround18/setup-osxcross@main  # OSXCROSS_TARGET unavailable in v1.1
         with:
           osx-version: "12.3"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 876cc15..eaa0837 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -129,9 +129,15 @@ jobs:
 
   build-mac-arm64:
     name: Build arm64 MacOS binary
-    # avoid OpenSSL 3.0.2 on 22.04: https://github.com/tpoechtrager/osxcross/issues/349
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
+      # workaround issue with OpenSSL 3.0.2 on 22.04: https://github.com/tpoechtrager/osxcross/issues/349
+      # issue is fixed in 3.0.7, so grab 3.0.8 from Ubuntu 23.04
+      - run: |
+          echo 'deb http://archive.ubuntu.com/ubuntu/ lunar main' >>/etc/apt/sources.list.d/lunar.list
+          echo 'APT::Default-Release "jammy";' >>/etc/apt/apt.conf
+          apt update
+          apt -t=lunar -y install openssl
       - uses: mbround18/setup-osxcross@main  # OSXCROSS_TARGET unavailable in v1.1
         with:
           osx-version: "12.3"