From 1168354a5ce7b1ea707cb5fce135e7c86ff93fc7 Mon Sep 17 00:00:00 2001
From: gluaxspeed <jonathan.t.pavlik@gmail.com>
Date: Wed, 14 Jul 2021 13:26:32 -0700
Subject: [PATCH] ci changes remove nightly asides from fmt

---
 .circleci/config.yml     | 16 ---------------
 .github/workflows/ci.yml | 42 +++++++++++++++++++++++++---------------
 2 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 602894ba20..759eb649b6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -60,21 +60,6 @@ jobs:
       - clear_environment:
           cache_key: leo-stable-cache
 
-  rust-nightly:
-    docker:
-      - image: howardwu/snarkos-ci:2021-03-25
-    resource_class: xlarge
-    steps:
-      - checkout
-      - setup_environment:
-          cache_key: leo-nightly-cache
-      - run:
-          name: Build and test
-          no_output_timeout: 30m
-          command: cargo test --all
-      - clear_environment:
-          cache_key: leo-nightly-cache
-
   leo-executable:
     docker:
       - image: cimg/rust:1.52.1
@@ -215,7 +200,6 @@ workflows:
   main-workflow:
     jobs:
       - rust-stable
-      - rust-nightly
       - leo-executable
       - leo-new:
           requires:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8f0d7c2e18..f6cde15d66 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -69,23 +69,41 @@ jobs:
           command: clippy
           args: --all-features --examples --all --benches
 
-  test-package:
+  test-package-linux:
     name: Test Package
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        rust:
-          - stable
-          - nightly
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Install Rust (${{ matrix.rust }})
+      - name: Install Rust Stable
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: ${{ matrix.rust }}
+          toolchain: stable
+          override: true
+
+      - name: Install cargo-all-features
+        run: |
+          cargo install cargo-all-features
+
+      - name: Test
+        run: |
+          cd package
+          cargo test-all-features
+
+  test-package-windows:
+    name: Test Package
+    runs-on: windows-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Install Rust Stable
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
           override: true
 
       - name: Install cargo-all-features
@@ -112,14 +130,6 @@ jobs:
           override: true
           components: rustfmt
 
-      - name: Test
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --all --features ci_skip
-        env:
-          CARGO_INCREMENTAL: "0"
-
       - name: Install dependencies for code coverage
         run: |
           sudo apt-get update