Split building binaries and images into separate workflow steps

Splitting into separate workflow steps makes the workflow more transparant

Signed-off-by: Marco Franssen <marco.franssen@gmail.com>

.github/workflows/ci.yaml

@@ -37,8 +37,11 @@ jobs:
           version: v1.53
           args: --timeout 7m
 
-      - name: Run make all
-        run: make all
+      - name: Build binaries
+        run: make build-binaries
+
+      - name: Build images
+        run: make images
 
       - name: Print job result
         run: |

.github/workflows/master-build.yaml

@@ -61,7 +61,7 @@ jobs:
       # build and push images tagged with GITHUB_SHA, version, and latest
       - name: Build and push tornjak backend image
         run: make release-backend
-        
+
       - name: Build and push tornjak frontend image
         run: make release-frontend
 

Makefile

@@ -54,12 +54,12 @@ binaries: $(addprefix bin/,$(BINARIES)) ## Build bin/tornjak-backend and bin/tor
 bin/tornjak-backend: tornjak-backend/cmd/agent $(GO_FILES) | vendor ## Build tornjak-backend binary
 	# Build hack because of flake of imported go module
 	docker run --rm -v "${PWD}":/usr/src/myapp -w /usr/src/myapp -e GOOS=linux -e GOARCH=amd64 golang:$(GO_VERSION) \
-		/bin/sh -c "go build --tags 'sqlite_json' ./$<; go build --tags 'sqlite_json' -mod=vendor -ldflags '-s -w -linkmode external -extldflags "-static"' -o $@ ./$<"
+		/bin/sh -c "go build --tags 'sqlite_json' ./$</main.go; go build --tags 'sqlite_json' -mod=vendor -ldflags '-s -w -linkmode external -extldflags "-static"' -o $@ ./$</main.go"
 
 bin/tornjak-manager: tornjak-backend/cmd/manager $(GO_FILES) | vendor ## Build bin/tornjak-manager binary
 	# Build hack because of flake of imported go module
 	docker run --rm -v "${PWD}":/usr/src/myapp -w /usr/src/myapp -e GOOS=linux -e GOARCH=amd64 golang:$(GO_VERSION) \
-		/bin/sh -c "go build --tags 'sqlite_json' -o tornjak-manager ./$<; go build --tags 'sqlite_json' -mod=vendor -ldflags '-s -w -linkmode external -extldflags "-static"' -o $@ ./$<"
+		/bin/sh -c "go build --tags 'sqlite_json' -o tornjak-manager ./$</main.go; go build --tags 'sqlite_json' -mod=vendor -ldflags '-s -w -linkmode external -extldflags "-static"' -o $@ ./$</main.go"
 
 frontend-local-build: ## Build tornjak-frontend
 	npm install --prefix tornjak-frontend