Update build, test and publish scripts to support aarch64-apple-darwi…

…n and remove cargo-workspaces

Cargo.toml

@@ -1,6 +1,7 @@
 [profile.release]
 codegen-units = 1
 lto = true
+panic = 'abort'
 
 [workspace]
 

Cross.toml

@@ -0,0 +1,2 @@
+[build]
+xargo = true

Xargo.toml

@@ -0,0 +1,2 @@
+[dependencies]
+std = {default-features=false, features=["panic_immediate_abort"]}

scripts/build-release.sh

@@ -1,12 +1,11 @@
 #!/bin/bash
 
 repo_root=$(git rev-parse --show-toplevel)
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-source "${DIR}/targets.sh"
+source "${repo_root}/scripts/targets.sh"
 
 targets=$(get_targets)
 
-version=$(cargo workspaces list --json | jq -r '.[] | select(.name=="yaml2json-rs-bin") | .version')
+version=$(grep --max-count=1 'version\ ' < 'crates/yaml2json-rs-bin/Cargo.toml' | cut -d' ' -f 3 | tr -d '"')
 version_dir="${repo_root}/target/versions/${version}"
 
 mkdir -p "${version_dir}"
@@ -35,9 +34,13 @@ build_target() {
         ;;
     esac
 
+    if command -v strip 1>/dev/null; then
+      strip "${filename}"
+    fi
+
     out="yaml2json-rs-v${version}-${target}.${extension}"
 
-    atool -a "${out}" "${filename}"
+    atool -qa "${out}" "${filename}"
     mv "${out}" "${version_dir}/${out}"
   )
 }

scripts/publish.sh

@@ -1,3 +1,13 @@
 #!/bin/bash
 
-cargo workspaces publish --exact
+repo_root=$(git rev-parse --show-toplevel)
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+# The order here matters, as yaml2json-rs-bin depends upon yaml-split and yaml2json-rs
+cargo publish --manifest-path "${repo_root}/crates/yaml-split/Cargo.toml"
+cargo publish --manifest-path "${repo_root}/crates/yaml2json-rs/Cargo.toml"
+
+# Hack: wait for the other crates' latest versions to become visible
+sleep 5
+cargo publish --manifest-path "${repo_root}/crates/yaml2json-rs-bin/Cargo.toml"
+

scripts/targets.sh

@@ -7,12 +7,18 @@ riscv64gc-unknown-linux-gnu
 x86_64-pc-windows-gnu
 x86_64-unknown-linux-gnu
 EOF
+)
+
+  macos_targets=$(cat <<-'EOF'
+aarch64-apple-darwin
+x86_64-apple-darwin
+EOF
 )
 
   if [[ -n "${ONLY_MACOS}" ]]; then
-    echo "x86_64-apple-darwin"
+    echo "${macos_targets}"
   elif [[ -z "${EXCLUDE_MACOS}" ]]; then
-    printf "%s\n%s" "${targets}" "x86_64-apple-darwin"
+    printf "%s\n%s" "${targets}" "${macos_targets}"
   else
     echo "${targets}"
   fi

scripts/test-all.sh

@@ -2,8 +2,8 @@
 
 # Output is silent, unless there are errors
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-source "${DIR}/targets.sh"
+repo_root=$(git rev-parse --show-toplevel)
+source "${repo_root}/scripts/targets.sh"
 
 targets=$(get_targets)