From 4c284d563094e91af7dd9ba3f4bdccf602c45ec5 Mon Sep 17 00:00:00 2001
From: chesedo <pieter@chesedo.me>
Date: Mon, 25 Jul 2022 16:49:03 +0200
Subject: [PATCH] ci: remove test GH action

---
 .circleci/config.yml       | 54 ++++++++++++++++-----------------
 .github/workflows/test.yml | 62 --------------------------------------
 2 files changed, 27 insertions(+), 89 deletions(-)
 delete mode 100644 .github/workflows/test.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ed302efc7..dcfe51cf6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -219,34 +219,34 @@ workflows:
   version: 2
   ci:
     jobs:
-      # - workspace-fmt
-      # - workspace-clippy:
-      #     name: workspace-clippy-<< matrix.framework >>
-      #     requires:
-      #       - workspace-fmt
-      #     matrix:
-      #       parameters:
-      #         framework: ["web-axum", "web-rocket", "web-tide", "web-tower"]
-      # - check-standalone:
-      #     matrix:
-      #       parameters:
-      #         path:
-      #           - examples/axum/hello-world
-      #           - examples/axum/websocket
-      #           - examples/rocket/authentication
-      #           - examples/rocket/hello-world
-      #           - examples/rocket/postgres
-      #           - examples/rocket/url-shortener
-      #           - examples/tide/hello-world
-      #           - examples/tide/postgres
-      #           - examples/tower/hello-world
-      # - service-test:
-      #     name: service-test
-      #     requires:
-      #       - workspace-clippy
+      - workspace-fmt
+      - workspace-clippy:
+          name: workspace-clippy-<< matrix.framework >>
+          requires:
+            - workspace-fmt
+          matrix:
+            parameters:
+              framework: ["web-axum", "web-rocket", "web-tide", "web-tower"]
+      - check-standalone:
+          matrix:
+            parameters:
+              path:
+                - examples/axum/hello-world
+                - examples/axum/websocket
+                - examples/rocket/authentication
+                - examples/rocket/hello-world
+                - examples/rocket/postgres
+                - examples/rocket/url-shortener
+                - examples/tide/hello-world
+                - examples/tide/postgres
+                - examples/tower/hello-world
+      - service-test:
+          name: service-test
+          requires:
+            - workspace-clippy
       - platform-test:
-          # requires:
-          #   - service-test
+          requires:
+            - workspace-clippy
           matrix:
             parameters:
               crate: ["shuttle-api", "cargo-shuttle", "shuttle-codegen", "shuttle-common", "shuttle-proto", "shuttle-provisioner"]
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
deleted file mode 100644
index 835c4d989..000000000
--- a/.github/workflows/test.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-name: cargo-test
-
-on:
-  push:
-    branches: [main]
-    paths: ["**/*.rs", "**/Cargo.toml", "**/Cargo.lock"]
-  pull_request:
-    branches: [main]
-    paths: ["**/*.rs", "**/Cargo.toml", "**/Cargo.lock"]
-  workflow_dispatch:
-
-jobs:
-  service_tests:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        features: ["web-axum", "web-rocket", "web-tide", "web-tower"]
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          override: true
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            **/target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('./Cargo.lock') }}
-      - name: cargo test --package shuttle-service
-        run: cargo test --package shuttle-service --features="codegen,loader,secrets,${{ matrix.features }}"
-  platform_tests:
-    strategy:
-      matrix:
-        crate: ["shuttle-provisioner", "shuttle-api", "cargo-shuttle"]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          override: true
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            **/target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('./Cargo.lock') }}
-      - name: Patch shuttle-service
-        run: |
-          cat<<EOF > ~/.cargo/config.toml
-          [patch.crates-io]
-          shuttle-service = { path = "$PWD/service" }
-          EOF
-      - name: cargo test ${{ matrix.crate }} --all-features
-        run: cargo test --package ${{ matrix.crate }} --all-features -- --nocapture