From 0072a559b07ca020991f5396fc141a9178e1d364 Mon Sep 17 00:00:00 2001 From: gearnode Date: Sun, 9 Mar 2025 15:45:10 +0100 Subject: [PATCH] Refactor CI Signed-off-by: gearnode --- .github/workflows/make.yaml | 15 +++------------ GNUmakefile | 2 +- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/.github/workflows/make.yaml b/.github/workflows/make.yaml index fa50c5e13..9afb0dcbe 100644 --- a/.github/workflows/make.yaml +++ b/.github/workflows/make.yaml @@ -6,7 +6,7 @@ on: pull_request: branches: - "main" - + jobs: docker-build: name: "docker-build" @@ -26,7 +26,7 @@ jobs: - run: "make docker-build" env: DOCKER_BUILD_FLAGS: "--push" - probod: + build: name: "bin/probod" runs-on: "ubuntu-22.04" permissions: @@ -34,20 +34,11 @@ jobs: steps: - uses: "actions/checkout@v4" - uses: "actions/setup-go@v5" - - run: "make bin/probod" - console: - name: "@probo/console" - runs-on: "ubuntu-22.04" - permissions: - contents: "read" - steps: - - uses: "actions/checkout@v4" - uses: "actions/setup-node@v4" with: node-version: 22 - run: "npm ci" - - run: "npm run lint" - - run: "make @probo/console" + - run: "make build" fmt-check: name: "fmt-check" runs-on: "ubuntu-22.04" diff --git a/GNUmakefile b/GNUmakefile index 49622ab47..bd6d3ac5c 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -35,7 +35,7 @@ vet: $(GO) vet ./... .PHONY: build -build: @probo/console bin/probod docker-build +build: @probo/console bin/probod .PHONY: docker-build docker-build: