From 1c55fdb39f929fda6385b946aa35868b8a74a5f2 Mon Sep 17 00:00:00 2001
From: arty <art.yerkes@gmail.com>
Date: Wed, 6 Mar 2024 17:15:47 -0800
Subject: [PATCH] Reset to baseline

---
 .github/workflows/build-test.yml      | 19 +++++++------------
 .github/workflows/extensive-tests.yml |  8 ++++----
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index be5ffc4d..6fa0cc7f 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -43,7 +43,7 @@ jobs:
     - name: Set up rust
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.71
+        toolchain: stable
 
     - name: Install dependencies
       run: |
@@ -83,7 +83,7 @@ jobs:
             . ./activate && \
             pip install --upgrade pip
           '
-        docker run --rm -v $(pwd):/io ghcr.io/pyo3/maturin:v1.5.0 build --release --strip --manylinux 2014
+        docker run --rm -v $(pwd):/io ghcr.io/pyo3/maturin:v1.1.0 build --release --strip --manylinux 2014
         # Refresh in case any ownerships changed.
         mv target target.docker && cp -r target.docker target
         # Ensure an empty .cargo-lock file exists.
@@ -346,7 +346,7 @@ jobs:
       - name: Install rust
         uses: actions-rs/toolchain@v1
         with:
-            toolchain: 1.71
+            toolchain: stable
             override: true
             components: rustfmt, clippy
       - name: fmt
@@ -358,7 +358,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.71
+          toolchain: stable
           components: clippy
           override: true
       - name: clippy
@@ -378,7 +378,7 @@ jobs:
       - name: Install rust
         uses: actions-rs/toolchain@v1
         with:
-            toolchain: 1.71
+            toolchain: stable
             components: rustfmt, clippy
       - name: cargo test
         run: cargo test
@@ -389,10 +389,9 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
-            toolchain: 1.71
+            toolchain: stable
       - name: Run for coverage
         run: |
-          set -e
           sudo apt-get update
           sudo apt-get install lcov -y
           rustup component add llvm-tools-preview
@@ -405,15 +404,11 @@ jobs:
           source venv/bin/activate
           git clone https://github.com/Chia-Network/clvm_tools.git --branch=main --single-branch
           pip install ./clvm_tools
-          pip install maturin==1.3.0 pytest
+          pip install maturin pytest
           maturin develop --release
-          echo 'PYTEST'
           (cd resources/tests/cmdline/tests && pytest)
-          echo 'PYTEST COMPLETE'
           grcov . --binary-path target -s . --branch --ignore-not-existing --ignore='*/.cargo/*' --ignore='*/tests/*' -o rust_cov.info
-          echo 'GRCOV RAN'
           python -c 'with open("rust_cov.info") as f: lines = [l for l in f if not (l.startswith("DA:") and int(l.split(",")[1].strip()) >= 2**63)]; open("lcov.info", "w").writelines(lines)'
-          echo 'COVERAGE STEP DONE'
       - name: Upload to Coveralls
         uses: coverallsapp/github-action@v2
         if: always()
diff --git a/.github/workflows/extensive-tests.yml b/.github/workflows/extensive-tests.yml
index c757658f..4d34d877 100644
--- a/.github/workflows/extensive-tests.yml
+++ b/.github/workflows/extensive-tests.yml
@@ -27,13 +27,13 @@ jobs:
     - name: Set up rusts
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.71
+        toolchain: stable
         components: rustfmt, clippy
 
     - name: Set up rust (stable)
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.71
+        toolchain: stable
         components: rustfmt, clippy
 
     - uses: actions/setup-python@v4
@@ -48,7 +48,7 @@ jobs:
     - name: Set up rust
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.71
+        toolchain: stable
 
     - name: Install dependencies
       run: |
@@ -77,7 +77,7 @@ jobs:
             . ./activate && \
             pip install --upgrade pip
           '
-        docker run --rm -v $(pwd):/io ghcr.io/pyo3/maturin:v1.5.0 build --release --strip --manylinux 2014
+        docker run --rm -v $(pwd):/io ghcr.io/pyo3/maturin:v1.1.0 build --release --strip --manylinux 2014
         # Refresh in case any ownerships changed.
         mv target target.docker && cp -r target.docker target
         # Ensure an empty .cargo-lock file exists.