From 9a1fd624816995be6db00ec65f66926b9c805c16 Mon Sep 17 00:00:00 2001
From: Chris Hennick <hennickc@amazon.com>
Date: Thu, 7 Mar 2024 16:31:08 -0800
Subject: [PATCH] Revert "Bug fix: RUSTFLAGS doesn't work to set profile, so
 set it in each `cargo` call"

This reverts commit fd6630afd2318f1e5b920e03888b7b086ff1f4bf.
---
 .github/workflows/ci.yaml | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 1c6ca020..1b75b49b 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -95,11 +95,11 @@ jobs:
       - run: cargo install cargo-fuzz
       - name: compile fuzz
         run: |
-          cargo fuzz build --profile=release-with-debug fuzz_read
+          cargo fuzz build fuzz_read
       - name: run fuzz
         timeout-minutes: 330
         run: |
-          cargo fuzz run --profile=release-with-debug fuzz_read -- -timeout=10s -fork=2 -runs=200000000 -max_len=5000 -len_control=10000 -dict=fuzz/fuzz.dict
+          cargo fuzz run fuzz_read -- -timeout=10s -fork=2 -runs=200000000 -max_len=5000 -len_control=10000 -dict=fuzz/fuzz.dict
       - name: Upload any failure inputs
         if: always()
         uses: actions/upload-artifact@v3
@@ -123,11 +123,11 @@ jobs:
       - run: cargo install cargo-fuzz
       - name: compile fuzz
         run: |
-          cargo fuzz build --profile=release-with-debug --no-default-features fuzz_read
+          cargo fuzz build --no-default-features fuzz_read
       - name: run fuzz
         timeout-minutes: 330
         run: |
-          cargo fuzz run --profile=release-with-debug --no-default-features fuzz_read -- -timeout=10s -fork=2 -runs=200000000 -max_len=16384 -len_control=10000 -dict=fuzz/fuzz.dict
+          cargo fuzz run --no-default-features fuzz_read -- -timeout=10s -fork=2 -runs=200000000 -max_len=16384 -len_control=10000 -dict=fuzz/fuzz.dict
       - name: Upload any failure inputs
         if: always()
         uses: actions/upload-artifact@v3
@@ -138,6 +138,8 @@ jobs:
 
   fuzz_write:
     runs-on: ubuntu-latest
+    env:
+      RUSTFLAGS: --profile=release-with-debug
     steps:
       - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
@@ -149,11 +151,11 @@ jobs:
       - run: cargo install cargo-fuzz
       - name: compile fuzz
         run: |
-          cargo fuzz build --profile=release-with-debug fuzz_write
+          cargo fuzz build fuzz_write
       - name: run fuzz
         timeout-minutes: 330
         run: |
-          cargo fuzz run --profile=release-with-debug fuzz_write -- -timeout=10s -fork=2 -runs=10000000 -max_len=2000 -len_control=200 -dict=fuzz/fuzz.dict
+          cargo fuzz run fuzz_write -- -timeout=10s -fork=2 -runs=10000000 -max_len=2000 -len_control=200 -dict=fuzz/fuzz.dict
       - name: Upload any failure inputs
         if: always()
         uses: actions/upload-artifact@v3
@@ -164,6 +166,8 @@ jobs:
 
   fuzz_write_with_no_features:
     runs-on: ubuntu-latest
+    env:
+      RUSTFLAGS: --profile=release-with-debug
     steps:
       - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
@@ -175,11 +179,11 @@ jobs:
       - run: cargo install cargo-fuzz
       - name: compile fuzz
         run: |
-          cargo fuzz build --profile=release-with-debug --no-default-features fuzz_write
+          cargo fuzz build --no-default-features fuzz_write
       - name: run fuzz
         timeout-minutes: 330
         run: |
-          cargo fuzz run --profile=release-with-debug --no-default-features fuzz_write -- -timeout=10s -fork=2 -runs=20000000 -max_len=10000 -len_control=200 -dict=fuzz/fuzz.dict
+          cargo fuzz run --no-default-features fuzz_write -- -timeout=10s -fork=2 -runs=20000000 -max_len=10000 -len_control=200 -dict=fuzz/fuzz.dict
       - name: Upload any failure inputs
         if: always()
         uses: actions/upload-artifact@v3