From a256d24234083ecc52fcbb4a2b0242679f7188c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20M=C3=BCller?= <deso@posteo.net>
Date: Fri, 18 Oct 2024 10:09:28 -0700
Subject: [PATCH] Test

---
 .github/workflows/test.yml | 25 +++++++++++++------------
 Cargo.toml                 | 10 ++++++++++
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 213e315a9..1a45968cd 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -26,13 +26,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        runs-on: [ubuntu-latest, macos-latest]
+        runs-on: [ubuntu-latest]
         rust: [stable]
         profile: [dev, release]
-        # gsym-in-apk requires `blazesym-dev/generate-unit-test-files`
-        # feature, which requires `llvm-gsymutil` installed. We don't
-        # want that dependency in this large OS spanning matrix.
-        args: ["--workspace --exclude=gsym-in-apk"]
+        args: ["--workspace"]
         include:
           - runs-on: ubuntu-latest
             rust: stable
@@ -49,10 +46,10 @@ jobs:
             rust: stable
             profile: release
             args: "--lib --no-default-features"
-          - runs-on: windows-latest
+          - runs-on: macos-latest
             rust: stable
-            profile: dev
-            args: "--tests --features=blazesym-dev/dont-generate-unit-test-files"
+            profile: release
+            args: "--lib --no-default-features"
           - runs-on: ubuntu-latest
             rust: stable
             profile: dev
@@ -135,10 +132,10 @@ jobs:
     env:
       LLVM_GSYMUTIL: /usr/bin/llvm-gsymutil-14
     steps:
+    - name: Install required tools
+      run: sudo apt-get install -y llvm-14 libelf-dev zlib1g-dev
     - uses: actions/checkout@v4
     - uses: dtolnay/rust-toolchain@nightly
-    - name: Install required tools
-      run: sudo apt-get install -y llvm-14
     - name: Check incremental rebuilds
       env:
         CARGO_OPTS: --workspace --quiet --tests
@@ -157,6 +154,8 @@ jobs:
     env:
       LLVM_GSYMUTIL: /usr/bin/llvm-gsymutil-14
     steps:
+    - name: Install required tools
+      run: sudo apt-get install -y llvm-14 libelf-dev zlib1g-dev
     - uses: actions/checkout@v4
     - uses: dtolnay/rust-toolchain@nightly
     - uses: Swatinem/rust-cache@v2
@@ -164,8 +163,6 @@ jobs:
       id: py312
       with:
         python-version: '3.12'
-    - name: Install required tools
-      run: sudo apt-get install -y llvm-14
     - name: Install cargo-llvm-cov
       uses: taiki-e/install-action@cargo-llvm-cov
     - name: Install llvm-tools-preview
@@ -277,6 +274,8 @@ jobs:
     env:
       LLVM_GSYMUTIL: /usr/bin/llvm-gsymutil-14
     steps:
+    - name: Install development dependencies
+      run: sudo apt-get install -y libelf-dev zlib1g-dev
     - uses: actions/checkout@v4
     - uses: dtolnay/rust-toolchain@nightly
     - uses: Swatinem/rust-cache@v2
@@ -316,6 +315,8 @@ jobs:
       # Stack borrows are very experimental. Disable for now.
       MIRIFLAGS: '-Zmiri-disable-stacked-borrows'
     steps:
+    - name: Install development dependencies
+      run: sudo apt-get install -y libelf-dev zlib1g-dev
     - uses: actions/checkout@v4
     - uses: dtolnay/rust-toolchain@master
       with:
diff --git a/Cargo.toml b/Cargo.toml
index 993d4d832..c1d7f7fe0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,6 +7,16 @@ members = [
   "examples/sym-debuginfod",
   "examples/gsym-in-apk",
 ]
+# Exclude the gsym-in-apk example from the workspace as it has a
+# dependency on `blazesym-dev`, which makes that a dependency on all
+# members by default, which is just nasty to deal with.
+default-members = [
+  ".",
+  "capi",
+  "cli",
+  "dev",
+  "examples/sym-debuginfod",
+]
 
 [package]
 name = "blazesym"