Skip to content

Commit

Permalink
ci: ah yes, GH actions path shenanigans, love 'em
Browse files Browse the repository at this point in the history
Signed-off-by: William Artero <git@artero.dev>
  • Loading branch information
wwmoraes committed Dec 5, 2023
1 parent 19328fa commit f3c0bca
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/integration.yml
Expand Up @@ -35,6 +35,7 @@ on:

env:
GOLANG_FLAGS: -race -mod=readonly
GOLANG_COVERAGE_PATH: coverage
GOLANG_MERGED_GOCOV_FILE: coverage/merged.txt
GOLANG_RUN_REPORT_FILE: coverage/run-report.json
GOLANG_VERSION: "1.20"
Expand Down Expand Up @@ -295,11 +296,13 @@ jobs:
uses: actions/download-artifact@v3
with:
name: run-report
path: ${{ env.GOLANG_COVERAGE_PATH }}

- name: download coverage report
uses: actions/download-artifact@v3
with:
name: coverage-report
path: ${{ env.GOLANG_COVERAGE_PATH }}

# - name: SonarCloud Scan
# uses: sonarsource/sonarcloud-github-action@master
Expand Down
4 changes: 2 additions & 2 deletions .make/golang.mk
Expand Up @@ -4,8 +4,6 @@ SPACE := $(shell echo " ")

GOLANG_PACKAGE = $(shell ${GO} list)

GOCOVERDIR ?= coverage/integration

GOLANG_FLAGS ?= -race -mod=readonly
GOLANG_OUTPUT_BIN_PATH ?= bin

Expand All @@ -20,6 +18,8 @@ GOLANG_INTEGRATION_SRC_PATH ?=
GOLANG_INTEGRATION_PACKAGES ?=
GOLANG_INTEGRATION_ENABLED ?= $(if ${GOLANG_INTEGRATION_SRC_PATH},1)

GOCOVERDIR ?= ${GOLANG_COVERAGE_PATH}/integration

CMD_SOURCE_FILES := $(shell ${GO} list -f '{{ range .GoFiles }}{{ printf "%s/%s\n" $$.Dir . }}{{ end }}' ./cmd/...)
INTERNAL_SOURCE_FILES := $(shell ${GO} list -f '{{ range .GoFiles }}{{ printf "%s/%s\n" $$.Dir . }}{{ end }}' ./internal/...)
SOURCE_FILES := ${CMD_SOURCE_FILES} ${INTERNAL_SOURCE_FILES}
Expand Down

0 comments on commit f3c0bca

Please sign in to comment.