From f92eec751f385636a2e700a70b594c1704fbf33a Mon Sep 17 00:00:00 2001 From: Jan Delgado Date: Mon, 19 Aug 2024 21:27:46 +0200 Subject: [PATCH 1/2] use coveralls native golang support --- .github/workflows/test.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c90150b..02bbb00 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,8 +8,8 @@ on: - master env: - GO_VERSION: "1.22.4" - GO_LANG_CI_LINT_VERSION: "v1.59.1" + GO_VERSION: "1.22.5" + GO_LANG_CI_LINT_VERSION: "v1.60.1" name: run tests jobs: @@ -35,7 +35,7 @@ jobs: - name: create certificates run: cd inttest/pki && ./mkcerts.sh - name: Run RabbitMQ - run: cd inttest/rabbitmq && docker-compose up -d + run: cd inttest/rabbitmq && docker compose up -d - name: Install Go if: success() uses: actions/setup-go@v4 @@ -46,13 +46,12 @@ jobs: timeout 30 sh -c "while true; do curl -s http://guest:password@localhost:15672/api/exchanges/%2f/amq.topic && break || sleep 3; done" - name: Run tests run: make test - - name: Convert coverage.out to coverage.lcov - uses: jandelgado/gcov2lcov-action@v1 - name: Coveralls - uses: coverallsapp/github-action@v1.1.2 + uses: coverallsapp/github-action@v2.3.0 with: github-token: ${{ secrets.github_token }} - path-to-lcov: coverage.lcov + file: coverage.out + format: golang - name: Build release artifacts if: env.build_artifacts # currently disabled uses: goreleaser/goreleaser-action@v3 From 15877ace0c09df6a67ec328828230443a5cb8422 Mon Sep 17 00:00:00 2001 From: Jan Delgado Date: Mon, 19 Aug 2024 21:34:56 +0200 Subject: [PATCH 2/2] linter --- cmd/rabtap/broker_info_renderer_dot.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/rabtap/broker_info_renderer_dot.go b/cmd/rabtap/broker_info_renderer_dot.go index 7695c92..c6671a3 100644 --- a/cmd/rabtap/broker_info_renderer_dot.go +++ b/cmd/rabtap/broker_info_renderer_dot.go @@ -262,6 +262,6 @@ func (s *brokerInfoRendererDot) renderNode(n interface{}, queueRendered map[stri // https://www.graphviz.org/doc/info/lang.html func (s *brokerInfoRendererDot) Render(rootNode *rootNode, out io.Writer) error { res := s.renderNode(rootNode, map[string]bool{}) - fmt.Fprintf(out, res.Text) + fmt.Fprint(out, res.Text) return nil }