ci: fix msrv runs (#175)

camshaft · Sep 10, 2023 · 868a399 · 868a399
1 parent 63ebde2
commit 868a399
Show file tree

Hide file tree

Showing 271 changed files with 420 additions and 305 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -44,44 +44,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust: [1.57.0, 1.64.0, stable, nightly]
+        rust: [1.57.0, stable, nightly]
         os: [ubuntu-latest, macOS-latest]
-        # TODO add honggfuzz back
-        test: [unit-tests, unit-tests-no-1.57, build-no-default-features, libfuzzer, afl, examples-tests]
-        sanitizer: [NONE]
-        exclude:
-          - rust: 1.57.0
-            test: unit-tests-no-1.57
-          # honggfuzz is broken on macOS
-          - os: macos-latest
-            test: honggfuzz
-        include:
-          - rust: nightly
-            os: ubuntu-latest
-            test: libfuzzer
-            sanitizer: address
-          # - rust: nightly
-          #   os: ubuntu-latest
-          #   test: honggfuzz
-          #   sanitizer: address
-          # TODO fix this
-          # - rust: nightly
-          #   os: ubuntu-latest
-          #   test: afl
-          #   sanitizer: address
-          - rust: nightly
-            os: macOS-latest
-            test: libfuzzer
-            sanitizer: address
-          # - rust: nightly
-          #   os: macOS-latest
-          #   test: honggfuzz
-          #   sanitizer: address
-          # TODO fix this
-          # - rust: nightly
-          #   os: macOS-latest
-          #   test: afl
-          #   sanitizer: address
 
     steps:
     - name: Ubuntu setup
@@ -101,23 +65,33 @@ jobs:
 
     - uses: actions/checkout@v3.5.3
 
+    # install stable for kani, cargo-bolero and test runner
+    - uses: actions-rs/toolchain@v1.0.7
+      with:
+        toolchain: stable
+        profile: minimal
+
+    - name: Install kani
+      run: |
+        cargo install --locked kani-verifier
+        cargo kani setup
+
     - uses: actions-rs/toolchain@v1.0.7
-      id: toolchain
       with:
         toolchain: ${{ matrix.rust }}
         profile: minimal
-        override: true
 
     - uses: camshaft/rust-cache@v1
       with:
-        key: ${{ matrix.test }}-${{ matrix.sanitizer }}
+        # kani isn't compatible with sccache
+        wrapper: false
+
+    - name: Setup target rustc
+      if: matrix.rust != 'stable' && matrix.rust != 'nightly'
+      run: echo "TARGET_RUSTC=${{ matrix.rust }}" >> $GITHUB_ENV
 
-    - name: ${{ matrix.test }}
-      run: make ${{ matrix.test }}
-      env:
-        AFL_I_DONT_CARE_ABOUT_MISSING_CRASHES: 1
-        AFL_SKIP_CPUFREQ: 1
-        SANITIZER: ${{ matrix.sanitizer }}
+    - name: Run tests
+      run: cargo +stable run
 
   kani:
     runs-on: ubuntu-latest
@@ -166,10 +140,10 @@ jobs:
       run: |
         cat <<EOF >> Cargo.toml
         [patch.crates-io]
-        bolero = { path = "../../../../bolero" }
-        bolero-engine = { path = "../../../../bolero-engine" }
-        bolero-generator = { path = "../../../../bolero-generator" }
-        bolero-generator-derive = { path = "../../../../bolero-generator-derive" }
+        bolero = { path = "../../../../lib/bolero" }
+        bolero-engine = { path = "../../../../lib/bolero-engine" }
+        bolero-generator = { path = "../../../../lib/bolero-generator" }
+        bolero-generator-derive = { path = "../../../../lib/bolero-generator-derive" }
         EOF
 
     - uses: camshaft/rust-cache@v1

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,17 +1,5 @@
 [workspace]
 members = [
-    "bolero",
-    "bolero-*",
-    "cargo-bolero",
+    "tests",
 ]
-
-[profile.fuzz]
-inherits = "dev"
-opt-level = 3
-incremental = false
-codegen-units = 1
-
-[profile.release]
-lto = true
-codegen-units = 1
-incremental = false
+resolver = "2"
diff --git a/Makefile b/Makefile
diff --git a/bin/Cargo.toml b/bin/Cargo.toml
@@ -0,0 +1,5 @@
+[workspace]
+members = [
+    "cargo-bolero",
+]
+resolver = "2"
diff --git a/cargo-bolero/Cargo.toml → bin/cargo-bolero/Cargo.toml b/cargo-bolero/Cargo.toml → bin/cargo-bolero/Cargo.toml
@@ -9,6 +9,7 @@ keywords = ["testing", "quickcheck", "property", "fuzz", "fuzzing"]
 license = "MIT"
 edition = "2018"
 readme = "README.md"
+rust-version = "1.66.0"
 
 [features]
 default = ["afl", "libfuzzer", "kani"]
@@ -20,8 +21,8 @@ libfuzzer = []
 [dependencies]
 anyhow = "1.0"
 bit-set = "0.5"
-bolero-afl = { version = "0.9", path = "../bolero-afl", default-features = false, features = ["bin"], optional = true }
-bolero-honggfuzz = { version = "0.9", path = "../bolero-honggfuzz", default-features = false, features = ["bin"], optional = true }
+bolero-afl = { version = "0.9", path = "../../lib/bolero-afl", default-features = false, features = ["bin"], optional = true }
+bolero-honggfuzz = { version = "0.9", path = "../../lib/bolero-honggfuzz", default-features = false, features = ["bin"], optional = true }
 humantime = "2"
 lazy_static = "1"
 rustc_version = "0.4"
@@ -31,7 +32,7 @@ serde_json = "1.0"
 tempfile = "3"
 
 [dev-dependencies]
-bolero = { version = "0.9", path = "../bolero" }
+bolero = { version = "0.9", path = "../../lib/bolero" }
 
 [[test]]
 name = "fuzz_bytes"
@@ -42,3 +43,4 @@ harness = false
 name = "fuzz_generator"
 path = "tests/fuzz_generator/fuzz_target.rs"
 harness = false
+
diff --git a/cargo-bolero/README.md → bin/cargo-bolero/README.md b/cargo-bolero/README.md → bin/cargo-bolero/README.md
diff --git a/cargo-bolero/build.rs → bin/cargo-bolero/build.rs b/cargo-bolero/build.rs → bin/cargo-bolero/build.rs
diff --git a/cargo-bolero/src/afl.rs → bin/cargo-bolero/src/afl.rs b/cargo-bolero/src/afl.rs → bin/cargo-bolero/src/afl.rs
diff --git a/cargo-bolero/src/engine.rs → bin/cargo-bolero/src/engine.rs b/cargo-bolero/src/engine.rs → bin/cargo-bolero/src/engine.rs
diff --git a/cargo-bolero/src/honggfuzz.rs → bin/cargo-bolero/src/honggfuzz.rs b/cargo-bolero/src/honggfuzz.rs → bin/cargo-bolero/src/honggfuzz.rs
diff --git a/cargo-bolero/src/kani.rs → bin/cargo-bolero/src/kani.rs b/cargo-bolero/src/kani.rs → bin/cargo-bolero/src/kani.rs
diff --git a/cargo-bolero/src/libfuzzer.rs → bin/cargo-bolero/src/libfuzzer.rs b/cargo-bolero/src/libfuzzer.rs → bin/cargo-bolero/src/libfuzzer.rs
diff --git a/cargo-bolero/src/list.rs → bin/cargo-bolero/src/list.rs b/cargo-bolero/src/list.rs → bin/cargo-bolero/src/list.rs
diff --git a/cargo-bolero/src/main.rs → bin/cargo-bolero/src/main.rs b/cargo-bolero/src/main.rs → bin/cargo-bolero/src/main.rs
diff --git a/cargo-bolero/src/manifest.rs → bin/cargo-bolero/src/manifest.rs b/cargo-bolero/src/manifest.rs → bin/cargo-bolero/src/manifest.rs
diff --git a/cargo-bolero/src/new.rs → bin/cargo-bolero/src/new.rs b/cargo-bolero/src/new.rs → bin/cargo-bolero/src/new.rs
diff --git a/cargo-bolero/src/project.rs → bin/cargo-bolero/src/project.rs b/cargo-bolero/src/project.rs → bin/cargo-bolero/src/project.rs
diff --git a/cargo-bolero/src/reduce.rs → bin/cargo-bolero/src/reduce.rs b/cargo-bolero/src/reduce.rs → bin/cargo-bolero/src/reduce.rs
diff --git a/cargo-bolero/src/selection.rs → bin/cargo-bolero/src/selection.rs b/cargo-bolero/src/selection.rs → bin/cargo-bolero/src/selection.rs
diff --git a/cargo-bolero/src/test.rs → bin/cargo-bolero/src/test.rs b/cargo-bolero/src/test.rs → bin/cargo-bolero/src/test.rs
diff --git a/cargo-bolero/src/test_target.rs → bin/cargo-bolero/src/test_target.rs b/cargo-bolero/src/test_target.rs → bin/cargo-bolero/src/test_target.rs
diff --git a/cargo-bolero/tests/fuzz_bytes/fuzz_target.rs → ...go-bolero/tests/fuzz_bytes/fuzz_target.rs b/cargo-bolero/tests/fuzz_bytes/fuzz_target.rs → ...go-bolero/tests/fuzz_bytes/fuzz_target.rs
diff --git a/...olero/tests/fuzz_generator/fuzz_target.rs → ...olero/tests/fuzz_generator/fuzz_target.rs b/...olero/tests/fuzz_generator/fuzz_target.rs → ...olero/tests/fuzz_generator/fuzz_target.rs
diff --git a/bin/rust-toolchain b/bin/rust-toolchain
@@ -0,0 +1,3 @@
+[toolchain]
+channel = "1.66.0"
+components = [ "rustc", "clippy", "rustfmt" ]
diff --git a/examples/basic/Cargo.toml b/examples/basic/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 arrayvec = "0.5"
 
 [dev-dependencies]
-bolero = { path = "../../bolero" }
+bolero = { path = "../../lib/bolero" }
 
 [workspace]
 members = ["."]