diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 76f279324..d5ac20716 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -86,8 +86,7 @@ jobs:
release-version: v1.10.2
platform: ${{matrix.ninja-platform}}
- # Build the Haskell lsp-test in its own step rather than as part of
- # the integration test because tarpaulin will timeout
+ # Build the Haskell lsp-test in its own step so the stdout isn't swallowed by nextest.
#
# We don't currently run this test on Windows because I've not been able to
# get GitHub actions to properly cache Haskell stuff there and it takes
@@ -96,8 +95,7 @@ jobs:
if: matrix.os != 'windows-latest'
run: stack build ditto-lsp-test
- - name: Run tests (without coverage)
- if: matrix.os != 'ubuntu-latest'
+ - name: Run tests
uses: actions-rs/cargo@v1
with:
command: nextest
@@ -106,30 +104,6 @@ jobs:
DITTO_BUILD_GIT_DESCRIBE: "0.0.0-test"
DITTO_NINJA: ${{steps.install-ninja.outputs.which}}
- - name: Install cargo-llvm-cov
- # Only run tests with coverage if running on Linux
- if: matrix.os == 'ubuntu-latest'
- uses: taiki-e/install-action@cargo-llvm-cov
-
- - name: Run tests (with coverage)
- # Only run tests with coverage if running on Linux
- if: matrix.os == 'ubuntu-latest'
- uses: actions-rs/cargo@v1
- with:
- command: llvm-cov
- args: --lcov --output-path lcov.info nextest --workspace
- env:
- DITTO_BUILD_GIT_DESCRIBE: "0.0.0-test"
- DITTO_NINJA: ${{steps.install-ninja.outputs.which}}
-
- - name: Upload coverage results to codecov.io 📡
- if: matrix.os == 'ubuntu-latest'
- uses: codecov/codecov-action@v3.1.0
- with:
- token: ${{secrets.CODECOV_TOKEN}}
- files: lcov.info
- fail_ci_if_error: true
-
treefmt:
name: treefmt 💅
runs-on: ubuntu-latest
diff --git a/README.md b/README.md
index 171c4ea8c..e97b27dce 100644
--- a/README.md
+++ b/README.md
@@ -12,9 +12,6 @@
-
-
-
diff --git a/codecov.yml b/codecov.yml
deleted file mode 100644
index bf08111d6..000000000
--- a/codecov.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-coverage:
- status:
- project:
- default:
- threshold: 1%
-comment:
- # Only comment on PRs if there are coverage changes
- require_changes: true
diff --git a/shell.nix b/shell.nix
index cd5e9fc09..cc01d6f2b 100644
--- a/shell.nix
+++ b/shell.nix
@@ -33,22 +33,6 @@ let
doCheck = false;
};
- cargo-llvm-cov = pkgs.rustPlatform.buildRustPackage rec {
- pname = "cargo-llvm-cov";
- version = "0.5.0";
- src = pkgs.fetchFromGitHub {
- owner = "taiki-e";
- repo = pname;
- rev = "v${version}";
- sha256 = "sha256-2O0MyL4SF/2AUpgWYUDWQ5dDpa84pwmnKGtAaWi5bwQ=";
- };
- cargoSha256 = "sha256-zQ1wgeKvc7q0pIx7ZWAQIayP/JVQGyFbLB3Iv81mbx0=";
- cargoPatches = [
- ./cargo-llvm-cov-cargo-lock.patch
- ];
- doCheck = false;
- };
-
# Don't forget to update .github/actions/setup-haskell
stack = pkgs.symlinkJoin {
name = "stack-with-system-ghc";
@@ -80,7 +64,6 @@ pkgs.mkShell {
rustToolchain
rust-analyzer
pkgs.cargo-nextest
- cargo-llvm-cov
pkgs.cargo-watch
pkgs.cargo-udeps
pkgs.cargo-audit