cleanup

Author: matthme

.github/workflows/CI.yml

@@ -26,68 +26,49 @@ jobs:
       fail-fast: false
       matrix:
         settings:
-          # - host: macos-latest
-          #   target: x86_64-apple-darwin
-          #   build: |
-          #     yarn build --target x86_64-apple-darwin
-          #     strip -x *.node
-          # - host: windows-latest
-          #   build: yarn build
-          #   target: x86_64-pc-windows-msvc
-          # - host: ubuntu-22.04
-          #   target: x86_64-unknown-linux-gnu
-          #   build: |-
-          #     set -e &&
-          #     yarn build --target x86_64-unknown-linux-gnu &&
-          #     strip *.node
-          # - host: macos-latest
-          #   target: aarch64-apple-darwin
-          #   build: |
-          #     yarn build --target aarch64-apple-darwin
-          #     strip -x *.node
+          - host: macos-latest
+            target: x86_64-apple-darwin
+            build: |
+              yarn build --target x86_64-apple-darwin
+              strip -x *.node
+          - host: windows-latest
+            build: yarn build
+            target: x86_64-pc-windows-msvc
+          - host: ubuntu-22.04
+            target: x86_64-unknown-linux-gnu
+            build: |-
+              set -e &&
+              yarn build --target x86_64-unknown-linux-gnu &&
+              strip *.node
+          - host: macos-latest
+            target: aarch64-apple-darwin
+            build: |
+              yarn build --target aarch64-apple-darwin
+              strip -x *.node
           - host: ubuntu-latest
             target: aarch64-unknown-linux-gnu
             # docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64
             build: |
-              uname -a
-              # echo "fetching zig tar"
+              # We don't actually need zig currently
               # curl --output zig-linux-x86_64-0.13.0.tar.xz https://ziglang.org/download/0.13.0/zig-linux-x86_64-0.13.0.tar.xz
-              # echo "unzipping zig"
               # tar xf zig-linux-x86_64-0.13.0.tar.xz
-              # pwd
-              # ls
-              # echo "exporting path"
               # export PATH=$PATH:$(pwd)/zig-linux-x86_64-0.13.0
+              # zig version
 
-
-              # echo "installing cross-compilation tools"
-              # sudo apt-get update
-              # sudo apt-get install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
-
-              # echo "setting env vars"
-              # export CC_aarch64_unknown_linux_gnu=clang
-              # export CFLAGS_aarch64_unknown_linux_gnu="--target=aarch64-unknown-linux-gnu --sysroot=/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot"
-
-              echo "installing gcc for aarch64"
+              # install gcc compiler for aarch64
               sudo apt update
               sudo apt install gcc-aarch64-linux-gnu
 
               aarch64-linux-gnu-gcc --version
 
-
-              # echo "zig version"
-              # zig version
-              # # Download libsodium
+              # Download libsodium
               mkdir libsodium
               curl -L --output ./libsodium/LATEST.tar.gz https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/LATEST.tar.gz
               curl -L --output ./libsodium/LATEST.tar.gz.minisig https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/LATEST.tar.gz.minisig
               curl -L --output ./libsodium/libsodium-1.0.19-stable.zip https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/libsodium-1.0.19-stable.zip
               curl -L --output ./libsodium/libsodium-1.0.19-stable.zip.minisig https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/libsodium-1.0.19-stable.zip.minisig
 
               CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --target aarch64-unknown-linux-gnu
-              # yarn build --target aarch64-unknown-linux-gnu
-              # SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --target aarch64-unknown-linux-gnu
-              # yarn build --target aarch64-unknown-linux-gnu --zig-abi-suffix=gnu
 
           # - host: ubuntu-latest
           #   target: armv7-unknown-linux-gnueabihf