Skip to content

Commit

Permalink
Merge pull request #1602 from thomasferrandiz/fix-error-log
Browse files Browse the repository at this point in the history
clarify the error logs for the CI pipeline
  • Loading branch information
thomasferrandiz authored Jul 5, 2022
2 parents c166d38 + 522c633 commit 19494a0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/e2eTests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
- name: Run tests
id: testing
continue-on-error: true
run: git fetch --all --tags && make test 2> errors.txt
- name: Show error message
run: git fetch --all --tags && make test 2>&1 > errors.txt
- name: Show additional logs
if: steps.testing.outcome != 'success'
run: |
cat errors.txt
Expand Down
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,13 @@ cover:
go tool cover -html=cover.out

header-check:
# run header-check script
./header-check.sh

# Throw an error if gofmt finds problems.
# "read" will return a failure return code if there is no output. This is inverted wth the "!"
gofmt:
# Running gofmt...
docker run --rm -e CGO_ENABLED=$(CGO_ENABLED) -e GOARCH=$(ARCH) \
-u $(shell id -u):$(shell id -g) \
-v $(CURDIR):/go/src/github.com/flannel-io/flannel \
Expand All @@ -110,6 +112,7 @@ gofmt:
! gofmt -d $(PACKAGES) 2>&1 | read'

verify-modules:
# Running verify-modules...
docker run --rm -e CGO_ENABLED=$(CGO_ENABLED) -e GOARCH=$(ARCH) \
-u $(shell id -u):$(shell id -g) \
-v $(CURDIR):/go/src/github.com/flannel-io/flannel \
Expand Down

0 comments on commit 19494a0

Please sign in to comment.