Add Linux with musl, Linux on aarch64, and macOS on aarch64 targets

Use cross to cross-compile from Ubuntu to these platforms.

This will resolve #357 and #368 when the next release goes out.

.github/workflows/release.yml

@@ -31,29 +31,31 @@ jobs:
     strategy:
       matrix:
         include:
-          # - target: aarch64-unknown-linux-gnu
-          #   os: ubuntu-20.04
-          # - target: aarch64-apple-darwin
-          #   os: macos-latest
+          # Targets that match the OS of the runner.
           - target: x86_64-unknown-linux-gnu
             os: ubuntu-20.04
           - target: x86_64-apple-darwin
             os: macos-latest
           - target: x86_64-pc-windows-msvc
             os: windows-latest
+
+          # Targets using cross-compilation (upload-rust-binary-action
+          # detects that they need cross).
+          - target: x86_64-unknown-linux-musl
+            os: ubuntu-20.04
+          - target: aarch64-unknown-linux-gnu
+            os: ubuntu-20.04
+          - target: aarch64-apple-darwin
+            os: ubuntu-20.04
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
       - uses: taiki-e/upload-rust-binary-action@v1
         with:
           bin: difft
           # (optional) On which platform to distribute the `.tar.gz` file.
-          # [default value: unix]
-          # [possible values: all, unix, windows, none]
           tar: unix
           # (optional) On which platform to distribute the `.zip` file.
-          # [default value: windows]
-          # [possible values: all, unix, windows, none]
           zip: windows
           # (optional) Target triple, default is host triple.
           target: ${{ matrix.target }}

.github/workflows/test.yml

@@ -3,15 +3,53 @@ on: [push, pull_request]
 name: Continuous integration
 
 jobs:
-  test_linux:
-    name: Test Linux
+  build:
+    name: Test ${{ matrix.job.target }}
+    runs-on: ${{ matrix.job.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        job:
+          - { target: x86_64-unknown-linux-gnu, os: ubuntu-20.04 }
+          - { target: x86_64-apple-darwin, os: macos-latest }
+          - { target: x86_64-pc-windows-gnu, os: windows-latest }
+          - { target: x86_64-unknown-linux-musl, os: ubuntu-20.04, use-cross: true }
+          - { target: aarch64-unknown-linux-gnu, os: ubuntu-20.04, use-cross: true }
+          - { target: aarch64-apple-darwin, os: ubuntu-20.04, use-cross: true }
+    env:
+      BUILD_CMD: cargo
+
+    steps:
+    - name: Checkout source code
+      uses: actions/checkout@v3
+
+    - name: Install Rust toolchain
+      uses: dtolnay/[email protected]
+      with:
+        targets: ${{ matrix.job.target }}
+
+    - name: Install cross
+      if: matrix.job.use-cross
+      uses: taiki-e/install-action@v2
+      with:
+        tool: cross
+
+    - name: Overwrite build command env variable
+      if: matrix.job.use-cross
+      shell: bash
+      run: echo "BUILD_CMD=cross" >> $GITHUB_ENV
+
+    - name: Test
+      shell: bash
+      run: $BUILD_CMD test
+
+  test_mime_db:
+    name: Test with MIME database
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
       - uses: dtolnay/[email protected]
-      - run: cargo test
-      # This also runs tests that rely on the MIME database being
-      # present.
+      # This runs tests that rely on the MIME database being present.
       - run: cargo test -- --ignored
 
   test_linux_latest_stable:
@@ -22,32 +60,6 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
       - run: cargo +stable test
 
-  # test_linux_arm64:
-  #   name: Test Linux arm64 (build only)
-  #   runs-on: ubuntu-20.04
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - uses: dtolnay/[email protected]
-  #     - run: rustup target add aarch64-unknown-linux-gnu
-  #     - run: sudo apt-get install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
-  #     - run: cargo build --target=aarch64-unknown-linux-gnu
-
-  test_mac:
-    name: Test macOS
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: dtolnay/[email protected]
-      - run: cargo test
-
-  test_windows:
-    name: Test Windows
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: dtolnay/[email protected]
-      - run: cargo test
-
   regression_test:
     name: Output Regression Test
     runs-on: ubuntu-20.04

CHANGELOG.md

@@ -11,6 +11,15 @@ you to set DFT_UNSTABLE. The JSON structure may change in future.
 
 Please give it a try and give feedback on GitHub issues.
 
+### Build
+
+Added support for Linux with musl, Linux on aarch64, and macOS on
+aarch64.
+
+Note that Difftastic already worked on these platforms, but they are
+now exercised in CI and will be included in prebuilt binaries in
+releases.
+
 ## 0.50 (released 15th August 2023)
 
 ### Conflicts