Build and release aarch64-apple-darwin binaries (#85)

Author: epk

.github/workflows/release.yml

@@ -4,19 +4,34 @@ on: [release]
 
 jobs:
   release:
-
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macOS-latest, ubuntu-18.04]
-
+        os: [macos-latest, ubuntu-latest]
+        target: [x86_64-unknown-linux-gnu, x86_64-apple-darwin, aarch64-apple-darwin]
+        exclude:
+        # Don't build linux targets on macos
+        - os: macos-latest
+          target: x86_64-unknown-linux-gnu
+        # Don't build darwin targets on ubuntu
+        - os: ubuntu-latest
+          target: x86_64-apple-darwin
+        - os: ubuntu-latest
+          target: aarch64-apple-darwin
     steps:
-    - uses: hecrj/[email protected]
-    - uses: actions/checkout@v1
-    - name: Build
-      run: cargo build --release
+    - uses: actions/checkout@v2
+    - uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        components: rustfmt, clippy
+        target: ${{ matrix.target }}
+        override: true
+    - uses: actions-rs/cargo@v1
+      with:
+        command: build
+        args: --release --target ${{ matrix.target }}
     - uses: Shopify/upload-to-release@master
       with:
-        name: shadowenv-${{ matrix.os }}
-        path: target/release/shadowenv
+        name: shadowenv-${{ matrix.target }}
+        path: target/{{ matrix.target }}/release/shadowenv
         repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/rust.yml

@@ -0,0 +1,36 @@
+name: Test
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-latest, ubuntu-latest]
+        target: [x86_64-unknown-linux-gnu, x86_64-apple-darwin, aarch64-apple-darwin]
+        toolchain: [stable, nightly]
+        exclude:
+        # Don't test linux targets on macos
+        - os: macos-latest
+          target: x86_64-unknown-linux-gnu
+        # Don't test darwin targets on ubuntu
+        - os: ubuntu-latest
+          target: x86_64-apple-darwin
+        - os: ubuntu-latest
+          target: aarch64-apple-darwin
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions-rs/toolchain@v1
+      with:
+        toolchain: ${{ matrix.toolchain }}
+        components: rustfmt, clippy
+        target: ${{ matrix.target }}
+        override: true
+    - name: fmt check
+      run: cargo fmt --all -- --check
+    - name: Build
+      run: cargo build --verbose
+    - name: Run tests
+      run: cargo test --verbose

.github/workflows/test.yml

@@ -1,18 +1,12 @@
 # Releasing Shadowenv
 
-1. Be running macOS
 1. Bump the version in `Cargo.toml`
-1. Build a release with `cargo build --release`
-1. Manually verify that the release at `target/release/shadowenv` seems ok, at least prints the
-   expected version with `--version`
 1. In `default.nix` replace the `cargoSha256` value with "0000000000000000000000000000000000000000000000000000"
 1. Run `nix build` and replace `cargoSha256` with the expected hash (which might not have changed after all)
 1. Commit with the message "bump version to x.y.z".
 1. Tag the commit as x.y.z (no leading 'v')
 1. Push the commit and the tag
-1. `cp target/release/shadowenv shadowenv-x86_64-apple-darwin`
-1. Open https://github.com/Shopify/shadowenv/releases and add `shadowenv-x86_64-apple-darwin` as
-   a file to the tag you just pushed.
+1. Create a new release at https://github.com/Shopify/shadowenv/releases
 
 ## (shopify-internal) releasing to `dev`:
 

CONTRIBUTING.md

@@ -2,10 +2,16 @@ name: shadowenv
 
 up:
   - rust
+  - custom:
+      name: Add rustup targets
+      met?: rustup target add aarch64-apple-darwin x86_64-apple-darwin
+      meet: rustup target add aarch64-apple-darwin x86_64-apple-darwin
 
 commands:
-  build:     cargo build
-  test:      cargo test
-  run-built: target/debug/shadowenv
-  add-man:   cp -r man/* /usr/local/share/man
-  style:     cargo fmt --all -- --check
+  release-aarch64:   cargo build --release --target aarch64-apple-darwin
+  release-x86_64:    cargo build --release --target x86_64-apple-darwin
+  build:             cargo build
+  test:              cargo test
+  run-built:         target/debug/shadowenv
+  add-man:           cp -r man/* /usr/local/share/man
+  style:             cargo fmt --all -- --check