From a653b64c912b72c897003e0b813aef95b64f460f Mon Sep 17 00:00:00 2001 From: zmstone Date: Fri, 13 Sep 2024 10:00:58 +0200 Subject: [PATCH 1/2] ci: use upload-artifacts v4 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 70d17a88..0ec21606 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -72,7 +72,7 @@ jobs: make test-env make t - name: Store test logs - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 if: always() with: name: ct-logs-otp-${{matrix.otp}}-kafka-${{matrix.kafka}} @@ -97,7 +97,7 @@ jobs: - name: Build Documentation run: rebar3 do hex build - name: Publish documentation - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: edoc path: doc From cfd9df8b05fe43b79a15c8331880f7c15b8b0313 Mon Sep 17 00:00:00 2001 From: zmstone Date: Fri, 13 Sep 2024 10:24:41 +0200 Subject: [PATCH 2/2] ci: remove coveralls for now --- .github/workflows/build.yml | 2 +- Makefile | 3 --- rebar.config | 2 +- rebar.config.script | 16 +--------------- 4 files changed, 3 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0ec21606..11954fbc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,7 +80,7 @@ jobs: - name: Create Cover Reports env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: rebar3 do cover,coveralls send + run: rebar3 do cover docs: needs: build runs-on: ubuntu-20.04 diff --git a/Makefile b/Makefile index 7b7d6db9..530c1cef 100644 --- a/Makefile +++ b/Makefile @@ -45,8 +45,5 @@ brod-cli: cover: @rebar3 cover -v -coveralls: - @rebar3 coveralls send - dialyzer: @rebar3 dialyzer diff --git a/rebar.config b/rebar.config index 763e7fb4..a13b3698 100644 --- a/rebar.config +++ b/rebar.config @@ -1,5 +1,5 @@ {deps, [{kafka_protocol, "4.1.5"}]}. -{project_plugins, [{coveralls, "~> 2.2.0"}, {rebar3_lint, "~> 3.2.5"}]}. +{project_plugins, [{rebar3_lint, "~> 3.2.5"}]}. {edoc_opts, [{preprocess, true}, {macros, [{build_brod_cli, true}]}]}. {erl_opts, [warnings_as_errors, warn_unused_vars,warn_shadow_vars,warn_obsolete_guard,debug_info]}. {xref_checks, [undefined_function_calls, undefined_functions, diff --git a/rebar.config.script b/rebar.config.script index f49a464e..63f052a0 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -5,18 +5,4 @@ Plugins = {project_plugins, lists:merge(ExtraPlugins, proplists:get_value(project_plugins, CONFIG))}; _ -> {project_plugins, proplists:get_value(project_plugins, CONFIG)} end, -CoverallsConfigs = case {os:getenv("GITHUB_ACTIONS"), os:getenv("GITHUB_TOKEN")} of - {"true", Token} when is_list(Token) -> - Configs = [{coveralls_repo_token, Token}, - {coveralls_coverdata, "_build/test/cover/*.coverdata"}, - {coveralls_service_job_id, os:getenv("GITHUB_RUN_ID")}, - {coveralls_commit_sha, os:getenv("GITHUB_SHA")}, - {coveralls_service_name, "github"}, - {coveralls_service_number, os:getenv("GITHUB_RUN_NUMBER")}], - case os:getenv("GITHUB_EVENT_NAME") =:= "pull_request" andalso string:tokens(os:getenv("GITHUB_REF"), "/") of - [_, "pull", PRNO, _] -> [{coveralls_service_pull_request, PRNO} | Configs]; - _ -> Configs - end; - _ -> [] -end, -[Plugins | lists:merge(CoverallsConfigs, CONFIG)]. \ No newline at end of file +[Plugins | CONFIG].