Attempt Two

Typo, Silicon Resources test and Signing improvement

Author: hydrusnetwork

.github/workflows/docker_build.yml

@@ -2,7 +2,7 @@ name: Build Containers
 on:
   push:
     tags:
-      - 'v*'
+      - 'NO-v*'
 
 jobs:
   build-client:

.github/workflows/release_linux.yml

@@ -2,7 +2,7 @@ name: Release-Linux
 on:
   push:
     tags:
-      - 'v*'
+      - 'NO-v*'
 
 jobs:
   build-ubuntu:

.github/workflows/release_macos_intel.yml

@@ -1,4 +1,4 @@
-name: Release-macOS
+name: Release-macOS-Intel
 on:
   push:
     tags:
@@ -55,7 +55,7 @@ jobs:
           cp static/build_files/macos_intel/requirements.txt requirements.txt
           basename $(rustc --print sysroot) | sed -e "s/^stable-//" > triple.txt
           rustup target add x86_64-apple-darwin
-          pyoxidizer build --release --target x86_64-apple-darwin
+          pyoxidizer build --release --target-triple x86_64-apple-darwin
           cd build/$(head -n 1 triple.txt)/release
           mkdir -p "Hydrus Network.app/Contents/MacOS"
           mkdir -p "Hydrus Network.app/Contents/Resources"

.github/workflows/release_macos_silicon.yml

@@ -1,4 +1,4 @@
-name: Release-macOS
+name: Release-macOS-Silicon
 on:
   push:
     tags:
@@ -54,7 +54,7 @@ jobs:
           cp static/build_files/macos_silicon/pyoxidizer.bzl pyoxidizer.bzl
           cp static/build_files/macos_silicon/requirements.txt requirements.txt
           basename $(rustc --print sysroot) | sed -e "s/^stable-//" > triple.txt
-          pyoxidizer build --release
+          pyoxidizer build --release --target-triple aarch64-apple-darwin
           cd build/$(head -n 1 triple.txt)/release
           mkdir -p "Hydrus Network.app/Contents/MacOS"
           mkdir -p "Hydrus Network.app/Contents/Resources"
@@ -69,7 +69,10 @@ jobs:
         run: |
           cd $GITHUB_WORKSPACE
           cd build/$(head -n 1 triple.txt)/release
-          codesign --sign - --force --deep --timestamp=none "Hydrus Network.app"
+          find "Hydrus Network.app/Contents" -type f -print0 |
+            xargs -0 -I{} sh -c 'file -b "{}" | grep -q "Mach-O" && codesign -s - --force --timestamp=none "{}" || true'
+          codesign --sign - --force --timestamp=none "Hydrus Network.app"
+          codesign --verify --verbose "Hydrus Network.app"
       -
         name: Zip it up
         run: |

.github/workflows/release_win.yml

@@ -2,7 +2,7 @@ name: Release-Win
 on:
   push:
     tags:
-      - 'v*'
+      - 'NO-v*'
 
 jobs:
   build-windows:

static/build_files/macos_silicon/pyoxidizer.bzl

@@ -1,5 +1,14 @@
 def make_dist():
-    return default_python_distribution( python_version = "3.10" )
+    return default_python_distribution(
+        python_version = "3.10",
+        target_triple = "aarch64-apple-darwin"
+    )
+
+def make_resource_policy(dist):
+    res = dist.make_resource_location_policy()
+	res.resources_location = "resources"
+	
+	return res
 
 def make_packaging_policy(dist):
     policy = dist.make_python_packaging_policy()
@@ -10,7 +19,7 @@ def make_packaging_policy(dist):
 
     return policy
 
-def make_client(dist, policy):
+def make_client(dist, policy, res):
     python_config = dist.make_python_interpreter_config()
     python_config.module_search_paths = ["$ORIGIN", "$ORIGIN/lib"]
     python_config.filesystem_importer = True
@@ -20,6 +29,7 @@ def make_client(dist, policy):
     client = dist.to_python_executable(
         name="hydrus_client",
         packaging_policy=policy,
+		resources_policy=res,
         config=python_config,
     )
 
@@ -48,7 +58,8 @@ print(CWD)
 # Tell PyOxidizer about the build targets defined above.
 register_target("dist", make_dist)
 register_target("policy", make_packaging_policy, depends=["dist"])
-register_target("hydrus_client", make_client, depends=["dist", "policy"])
+register_target("res", make_packaging_policy, depends=["dist"])
+register_target("hydrus_client", make_client, depends=["dist", "policy", "res"])
 register_target("resources", make_embedded_resources, depends=["hydrus_client"], default_build_script=True)
 register_target("install", make_install, depends=["hydrus_client", "resources"], default=True)