Use patched covveralls version to fix reporting (#223)

erlef · Sep 11, 2023 · 9764054 · 9764054
1 parent da2f79c
commit 9764054
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 31 deletions.
diff --git a/.github/workflows/part_docs.yml b/.github/workflows/part_docs.yml
@@ -33,13 +33,13 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: _build
-          key: docs-build-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ steps.setupBEAM.outputs.elixir-version }}-${{ hashFiles('rebar.lock') }}
+          key: docs-build-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ steps.setupBEAM.outputs.elixir-version }}-${{ hashFiles('rebar.config') }}
           restore-keys: |
             docs-build-{{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ steps.setupBEAM.outputs.elixir-version }}-
       - uses: actions/cache@v3
         with:
           path: deps
-          key: docs-deps-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ steps.setupBEAM.outputs.elixir-version }}-${{ hashFiles('rebar.lock') }}
+          key: docs-deps-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ steps.setupBEAM.outputs.elixir-version }}-${{ hashFiles('rebar.config') }}
           restore-keys: |
             docs-bdepsuild-{{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ steps.setupBEAM.outputs.elixir-version }}-
       - run: mix deps.get

diff --git a/.github/workflows/part_test.yml b/.github/workflows/part_test.yml
@@ -18,7 +18,7 @@ env:
 
 jobs:
   rebar_format:
-    name: Check Rebar Formatting
+    name: rebar3 fmt
 
     runs-on: ubuntu-latest
 
@@ -32,13 +32,13 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: _build
-          key: rebar_format-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('rebar.lock') }}
+          key: rebar_format-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('rebar.config') }}
           restore-keys: |
             rebar_format-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-
       - run: rebar3 fmt --check
 
   mix_format:
-    name: Check Mix Formatting
+    name: mix format
 
     runs-on: ubuntu-latest
 
@@ -53,20 +53,20 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: _build
-          key: mix_format-build-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('rebar.lock') }}
+          key: mix_format-build-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('mix.exs') }}
           restore-keys: |
             mix_format-build-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-
       - uses: actions/cache@v3
         with:
           path: deps
-          key: mix_format-deps-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('rebar.lock') }}
+          key: mix_format-deps-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('mix.exs') }}
           restore-keys: |
             mix_format-deps-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-
       - run: mix deps.get
       - run: mix format --check-formatted
 
   eunit:
-    name: Run EUnit
+    name: rebar3 eunit
 
     runs-on: ubuntu-latest
 
@@ -87,7 +87,7 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: _build
-          key: eunit-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('rebar.lock') }}
+          key: eunit-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('rebar.config') }}
           restore-keys: |
             eunit-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-
       - run: rebar3 eunit --cover
@@ -97,7 +97,7 @@ jobs:
           path: _build/test/cover/eunit.coverdata
 
   conformance:
-    name: Run Conformance Tests
+    name: rebar3 ct
 
     runs-on: ubuntu-latest
 
@@ -111,7 +111,7 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: _build
-          key: ct-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('rebar.lock') }}
+          key: ct-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('rebar.config') }}
           restore-keys: |
             ct-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-
       - run: rebar3 ct --cover
@@ -121,7 +121,7 @@ jobs:
           path: _build/test/cover/ct.coverdata
 
   mix_test:
-    name: Run Mix Tests
+    name: mix test
 
     runs-on: ubuntu-latest
 
@@ -136,13 +136,13 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: _build
-          key: mix_test-build-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('rebar.lock') }}
+          key: mix_test-build-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('mix.exs') }}
           restore-keys: |
             mix_test-build-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-
       - uses: actions/cache@v3
         with:
           path: deps
-          key: mix_test-deps-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('rebar.lock') }}
+          key: mix_test-deps-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('mix.exs') }}
           restore-keys: |
             mix_test-deps-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-
       - run: mix deps.get
@@ -153,7 +153,7 @@ jobs:
           path: cover/mix_test.coverdata
 
   coverage:
-    name: Process Test Coverage
+    name: rebar3 cover
 
     runs-on: ubuntu-latest
 
@@ -169,7 +169,7 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: _build
-          key: cover-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('rebar.lock') }}
+          key: cover-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('rebar.config') }}
           restore-keys: |
             cover-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-
       - uses: actions/download-artifact@v3
@@ -191,12 +191,16 @@ jobs:
           path: _build/test/cover/
 
   coveralls:
-    name: Send Coverage to coveralls.io
+    name: rebar3 coveralls send
 
     runs-on: ubuntu-latest
 
     needs: ["eunit", "conformance", "mix_test"]
 
+    # TODO: Remove
+    env:
+      DIAGNOSTIC: "1"
+
     steps:
       - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
@@ -207,7 +211,7 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: _build
-          key: cover-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('rebar.lock') }}
+          key: cover-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('rebar.config') }}
           restore-keys: |
             cover-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-
       - uses: actions/download-artifact@v3
@@ -231,7 +235,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   lint:
-    name: Lint
+    name: rebar3 lint
 
     runs-on: ubuntu-latest
 
@@ -245,13 +249,13 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: _build
-          key: lint-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('rebar.lock') }}
+          key: lint-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('rebar.config') }}
           restore-keys: |
             lint-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-
       - run: rebar3 lint
 
   credo:
-    name: Run Credo
+    name: mix credo
 
     runs-on: ubuntu-latest
 
@@ -266,20 +270,20 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: _build
-          key: credo-build-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('rebar.lock') }}
+          key: credo-build-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('mix.exs') }}
           restore-keys: |
             credo-build-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-
       - uses: actions/cache@v3
         with:
           path: deps
-          key: credo-deps-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('rebar.lock') }}
+          key: credo-deps-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('mix.exs') }}
           restore-keys: |
             credo-deps-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-
       - run: mix deps.get
       - run: mix credo
 
   dialyxir:
-    name: Run Dialyxir
+    name: mix dialyzer
 
     runs-on: ubuntu-latest
 
@@ -294,20 +298,20 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: _build
-          key: dialyxir-build-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('rebar.lock') }}
+          key: dialyxir-build-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('mix.exs') }}
           restore-keys: |
             dialyxir-build-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-
       - uses: actions/cache@v3
         with:
           path: deps
-          key: dialyxir-deps-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('rebar.lock') }}
+          key: dialyxir-deps-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('mix.exs') }}
           restore-keys: |
             dialyxir-deps-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-
       - run: mix deps.get
       - run: mix dialyzer
 
   dialyzer:
-    name: Dialyzer
+    name: rebar3 dialyzer
 
     runs-on: ubuntu-latest
 
@@ -321,13 +325,13 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: _build
-          key: dialyzer-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('rebar.lock') }}
+          key: dialyzer-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('rebar.config') }}
           restore-keys: |
             dialyzer-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-
       - run: rebar3 dialyzer
 
   hank:
-    name: Hank
+    name: rebar3 hank
 
     runs-on: ubuntu-latest
 
@@ -341,7 +345,7 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: _build
-          key: hank-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('rebar.lock') }}
+          key: hank-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-${{ hashFiles('rebar.config') }}
           restore-keys: |
             hank-${{ runner.os }}-${{ steps.setupBEAM.outputs.otp-version }}-
       - run: rebar3 hank
diff --git a/rebar.config b/rebar.config
@@ -5,7 +5,10 @@
 {deps, [{telemetry, "~> 1.2"}, {jose, "~> 1.11"}, {meck, "~> 0.9.2"}]}.
 
 {project_plugins, [
-    coveralls,
+    %% Revert back to released version when this PR is merged & released:
+    %% https://github.com/markusn/coveralls-erl/pull/36
+    {coveralls, ".*",
+        {git, "https://github.com/RoadRunnr/coveralls-erl.git", {branch, "feature/git-info"}}},
     erlfmt,
     rebar3_hank,
     rebar3_lint