feat: add support for M1 macOS

.github/workflows/ci.yml

@@ -1,15 +1,24 @@
 ---
+
 name: CI
 
 on: [ pull_request ]
 
+# This pipeline validates proposed changes.
+#
+# CI pipeline based on:
+# - https://github.com/heim-rs/heim/blob/master/.github/workflows/ci.yml
+# - https://github.com/BurntSushi/ripgrep/blob/master/.github/workflows/ci.yml
+# - https://github.com/ClementTsang/bottom/blob/master/.github/workflows/ci.yml
+
+env:
+  BINARY_NAME: monorepo
+  CARGO_TERM_COLOR: always
+  RUST_BACKTRACE: 1
+
 jobs:
-  build:
+  build-docker-image:
     runs-on: ubuntu-latest
-    env:
-      BINARY_NAME: monorepo
-      CARGO_TERM_COLOR: always
-      RUST_BACKTRACE: 1
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -32,10 +41,58 @@ jobs:
           target/
         key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
-    - name: Run cargo check
+    - name: Build docker image
+      run: docker build -f Dockerfile .
+
+  # Room for improvement regarding caching/work-skipping. One example here
+  # https://github.com/ClementTsang/bottom/blob/92ec3599363c710815c286e975bbb6cc748708dd/.github/workflows/ci.yml#L195
+  cargo-check:
+    runs-on: ${{ matrix.triple.os }}
+    strategy:
+      matrix:
+        triple:
+          - {
+              os: "ubuntu-latest",
+              target: "x86_64-unknown-linux-musl",
+              cross: false,
+            }
+          - {
+              os: "ubuntu-latest",
+              target: "i686-unknown-linux-musl",
+              cross: true,
+            }
+          - {
+              os: "macOS-latest",
+              target: "x86_64-apple-darwin",
+              cross: false,
+            }
+          # aarch64
+          - {
+              os: "ubuntu-latest",
+              target: "aarch64-unknown-linux-musl",
+              cross: true,
+            }
+          # macOS ARM
+          - {
+              os: "macOS-latest",
+              target: "aarch64-apple-darwin",
+              cross: true,
+            }
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Install toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: stable
+        override: true
+        target: ${{ matrix.triple.target }}
+
+    - name: Cargo check
       uses: actions-rs/cargo@v1
       with:
         command: check
-
-    - name: Build docker image
-      run: docker build -f Dockerfile .
+        args: --all-targets --verbose --target=${{ matrix.triple.target }}
+        use-cross: ${{ matrix.triple.cross }}

.github/workflows/release.yml

@@ -1,4 +1,5 @@
 ---
+
 name: Release
 
 on:
@@ -18,70 +19,90 @@ on:
 # - npm publish
 # - create GitHub release
 
+env:
+  BINARY_NAME: monorepo
+  CARGO_TERM_COLOR: always
+  RUST_BACKTRACE: 1
+
 jobs:
-  release:
+
+  semantic-version:
     runs-on: ubuntu-latest
-    env:
-      BINARY_NAME: monorepo
-      CARGO_TERM_COLOR: always
-      RUST_BACKTRACE: 1
-    steps:
-    - name: Login to DockerHub
-      uses: docker/login-action@v1
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_TOKEN }}
+    outputs:
+      next-version: ${{ steps.calculate.outputs.next-version }}
 
+    steps:
     - name: Checkout
       uses: actions/checkout@v3
-
-    - name: Install macOS cross-compilation dependencies
-      run: |
-        sudo apt update
-        sudo apt install --yes \
-          g++ \
-          gcc \
-          libgmp-dev \
-          libmpc-dev \
-          libmpfr-dev \
-          libssl-dev \
-          libxml2-dev \
-          zlib1g-dev
-
-    - name: Cache osxcross
-      uses: actions/cache@v3
-      id: cache-osxcross
       with:
-        path: |
-          ~/osxcross
-        key: ${{ runner.os }}-osxcross-${{ hashFiles('$GITHUB_WORKSPACE/ci/resource-macos-sdk') }}
+        # Fetch all history and tags for calculating next semantic version
+        fetch-depth: 0
 
-    - name: Install osxcross
-      if: steps.cache-osxcross.outputs.cache-hit != 'true'
-      run: |
-        sdk=$(cat $GITHUB_WORKSPACE/ci/resource-macos-sdk)
-        git clone https://github.com/tpoechtrager/osxcross ~/osxcross
-        pushd ~/osxcross
-        curl -O $sdk
-        mv $(basename $sdk) tarballs/
-        UNATTENDED=yes OSX_VERSION_MIN=10.7 ./build.sh
-        popd
-
-    - name: Add macOS cross-compilation binaries to path
-      run: echo "$HOME/osxcross/target/bin" >> $GITHUB_PATH
-
-    - name: Install GNU/Linux toolchain
-      uses: actions-rs/toolchain@v1
+    - name: Configure Node.js
+      uses: actions/setup-node@v2
       with:
-        profile: minimal
-        toolchain: stable
-        target: x86_64-unknown-linux-gnu
+        node-version: lts/*
+        cache: npm
+
+    - name: Install npm dependencies
+      run: npm ci --ignore-scripts
+
+    - name: Calculate next semantic-release version
+      id: calculate
+      run: echo "::set-output name=next-version::$(npx standard-version --dry-run | grep "tagging release" | awk '{ print $NF }')"
+
+  # Room for improvement regarding caching/work-skipping. One example here
+  # https://github.com/ClementTsang/bottom/blob/92ec3599363c710815c286e975bbb6cc748708dd/.github/workflows/ci.yml#L195
+
+  ### Compile release artifacts
+  build-release:
+    runs-on: ${{ matrix.triple.os }}
+    container: ${{ matrix.triple.container }}
+    needs:
+      - semantic-version
+
+    strategy:
+      matrix:
+        triple:
+          - {
+              os: "ubuntu-latest",
+              target: "x86_64-unknown-linux-musl",
+              cross: false,
+            }
+          - {
+              os: "ubuntu-latest",
+              target: "i686-unknown-linux-musl",
+              cross: true,
+            }
+          - {
+              os: "macOS-latest",
+              target: "x86_64-apple-darwin",
+              cross: false,
+            }
+          # aarch64
+          - {
+              os: "ubuntu-latest",
+              target: "aarch64-unknown-linux-musl",
+              cross: true,
+            }
+          # macOS ARM
+          - {
+              os: "macOS-latest",
+              target: "aarch64-apple-darwin",
+              cross: true,
+            }
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
 
-    - name: Install macOS toolchain
+    - name: Install toolchain
       uses: actions-rs/toolchain@v1
       with:
+        profile: minimal
         toolchain: stable
-        target: x86_64-apple-darwin
+        override: true
+        target: ${{ matrix.triple.target }}
 
     - name: Cache cargo
       uses: actions/cache@v3
@@ -102,6 +123,66 @@ jobs:
         command: install
         args: semantic-release-rust --version 1.0.0-alpha.8
 
+    - name: Prepare semantic-release for Rust
+      run: semantic-release-rust prepare ${{ needs.semantic-version.outputs.next-version }}
+
+    - name: Cargo build
+      uses: actions-rs/cargo@v1
+      with:
+        command: build
+        args: --all-targets --verbose --target=${{ matrix.triple.target }} --release
+        use-cross: ${{ matrix.triple.cross }}
+
+    - name: Create release archive
+      run: |
+        mkdir dist
+        mkdir -p builds/typescript-tools-${{ matrix.triple.target }}
+        cp target/${{ matrix.triple.target }}/release/monorepo builds/typescript-tools-${{ matrix.triple.target }}/
+        tar -C builds -czvf dist/typescript-tools-${{ matrix.triple.target }}.tar.gz typescript-tools-${{ matrix.triple.target }}
+
+    - name: Create checksum
+      run: shasum --algorithm 256 typescript-tools-${{ matrix.triple.target }}.tar.gz > typescript-tools-${{ matrix.triple.target }}-SHASUMS256.txt
+      working-directory: ./dist
+
+    - name: Upload release artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: ${{ matrix.triple.target }}
+        path: |
+          dist/typescript-tools-${{ matrix.triple.target }}.tar.gz
+          dist/typescript-tools-${{ matrix.triple.target }}-SHASUMS256.txt
+        if-no-files-found: error
+        retention-days: 1
+
+  ### Perform the semantic-release
+  release:
+    runs-on: ubuntu-latest
+    needs:
+      - build-release
+
+    steps:
+    - name: Login to DockerHub
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_TOKEN }}
+
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Download release artifacts
+      uses: actions/download-artifact@v3
+      with:
+        path: dist
+
+    - name: Display downloaded release artifacts
+      run: ls -R
+      working-directory: dist
+
+    - name: Combine checksums
+      run: cat **/typescript-tools-*-SHASUMS256.txt | tee SHASUMS256.txt
+      working-directory: dist
+
     - name: Invoke semantic-release
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.releaserc.json

@@ -15,12 +15,6 @@
       }
     ],
     "@semantic-release/release-notes-generator",
-    [
-      "@semantic-release/exec",
-      {
-        "prepareCmd": "./ci/prepare-cmd ${nextRelease.version}"
-      }
-    ],
     [
       "@codedependant/semantic-release-docker",
       {
@@ -42,12 +36,28 @@
       {
         "assets": [
           {
-            "path": "dist/typescript-tools-x86_64-unknown-linux-gnu.tar.gz",
-            "label": "x86_64-unknown-linux-gnu"
+            "path": "dist/x86_64-unknown-linux-musl/typescript-tools-x86_64-unknown-linux-musl.tar.gz",
+            "label": "x86_64-unknown-linux-musl"
+          },
+          {
+            "path": "dist/i686-unknown-linux-musl/typescript-tools-i686-unknown-linux-musl.tar.gz",
+            "label": "i686-unknown-linux-musl"
           },
           {
-            "path": "dist/typescript-tools-x86_64-apple-darwin.tar.gz",
+            "path": "dist/x86_64-apple-darwin/typescript-tools-x86_64-apple-darwin.tar.gz",
             "label": "x86_64-apple-darwin"
+          },
+          {
+            "path": "dist/aarch64-unknown-linux-musl/typescript-tools-aarch64-unknown-linux-musl.tar.gz",
+            "label": "aarch64-unknown-linux-musl"
+          },
+          {
+            "path": "dist/aarch64-apple-darwin/typescript-tools-aarch64-apple-darwin.tar.gz",
+            "label": "aarch64-apple-darwin"
+          },
+          {
+            "path": "dist/SHASUMS256.txt",
+            "label": "SHASUMS256.txt"
           }
         ]
       }

.versionrc.json

@@ -0,0 +1,5 @@
+{
+  "packageFiles": [],
+  "bumpFiles": [],
+  "tagPrefix": ""
+}

README.md

@@ -33,13 +33,16 @@ workflow.
 
 ## Supported Systems
 
-The following operating systems are supported
+The following target triples are supported:
 
-- [x] GNU/Linux
-- [x] Mac OS
-- [ ] Windows
+- x86_64-unknown-linux-musl
+- i686-unknown-linux-musl
+- x86_64-apple-darwin
+- aarch64-unknown-linux-musl
+- aarch64-apple-darwin
 
 The following package managers are supported
 
 - [x] npm
 - [ ] yarn
+- [ ] pnpm

bin/monorepo

@@ -1,9 +1,3 @@
-#!/bin/sh
-
-cat <<EOF
-This is not the "monorepo" binary, which is usually downloaded via the npm "postinstall"
-hook. Was the "npm install" run with the "--ignore-scripts" flag?
-
-Please try reinstalling "@typescript-tools/rust-implementation" or opening a ticket with
-details about your use case.
-EOF
+# This is a dummy binary that is the subject of the `npm install` workflow --
+# it gets linked into node_modules/.bin and marked as executable before the
+# npm postInstall hook executes