make and ci fixes

Signed-off-by: Peter Wilcsinszky <[email protected]>
kube-logging · Jul 26, 2023 · 08b974d · 08b974d
1 parent 9d2e693
commit 08b974d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/.github/workflows/artifacts.yaml b/.github/workflows/artifacts.yaml
@@ -22,6 +22,9 @@ jobs:
  - name: Checkout
  uses: actions/checkout@v3
 
+ - name: Init
+ run: make go.work
+
  - name: Gather metadata
  id: meta
  uses: docker/metadata-action@v4

diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
@@ -18,7 +18,7 @@ jobs:
  uses: actions/checkout@v3
 
  - name: Build
- run: go build -v ./...
+ run: make build
 
  - name: Test
- run: go test -v ./...
+ run: make test
diff --git a/Makefile b/Makefile
@@ -25,16 +25,20 @@ check: license-cache license-check
 go.work:
  go work init . ${CUSTOM_FORMATS}
 
-.PHONY:
+.PHONY: reinit
 reinit:
  rm -f go.work
  @$(MAKE) go.work
 
-.PHONY:
+.PHONY: build
 build: go.work
  CGO_ENABLED=0 go build -a -o ${BIN}/loggen main.go
 
-.PHONY:
+.PHONY: test
+test: go.work
+ go test ./...
+
+.PHONY: docker-run
 docker-run:
  docker build . -t log-generator:local && docker run -p 11000:11000 log-generator:local