clean up wasm32 test

neondatabase · Jun 10, 2023 · 6f19bb9 · 6f19bb9
1 parent 852869d
commit 6f19bb9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -71,13 +71,8 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: target
-          key: clippy-target-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}y
-      - run: |
-          # Hack: wasm support currently relies on not having tokio with features like socket enabled. With resolver 1
-          # dev dependencies can add unwanted dependencies to the build, so we'll hackily disable them for this check.
-
-          sed -i 's/\[dev-dependencies]/[ignore-dependencies]/g' ./tokio-postgres/Cargo.toml
-          cargo check --target wasm32-unknown-unknown --manifest-path tokio-postgres/Cargo.toml --no-default-features --features js
+          key: check-wasm32-target-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}
+      - run: cargo check --target wasm32-unknown-unknown --manifest-path tokio-postgres/Cargo.toml --no-default-features --features js
 
   test:
     name: test

diff --git a/Cargo.toml b/Cargo.toml
@@ -10,6 +10,7 @@ members = [
     "postgres-types",
     "tokio-postgres",
 ]
+resolver = "2"
 
 [profile.release]
 debug = 2