From e71947b9215c31086230a0e62118efb3fb0b807a Mon Sep 17 00:00:00 2001 From: wonderf00l Date: Wed, 20 Dec 2023 15:58:48 +0300 Subject: [PATCH] dev4: changed makefile variable, included all branches in CI --- .github/workflows/ci.yml | 1 - Makefile | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e0f2a3f..863258e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,6 @@ on: push: {} pull_request: types: [opened, edited, reopened] - branches: [main, dev4] jobs: test: diff --git a/Makefile b/Makefile index ee03e17..f054d18 100644 --- a/Makefile +++ b/Makefile @@ -8,8 +8,7 @@ COV_OUT=coverage.out COV_HTML=coverage.html CURRCOVER=github.com/go-park-mail-ru/2023_2_OND_team/internal/pkg/delivery/http/v1 -PROJECT_DIR = $(shell pwd) -PROJECT_BIN = $(PROJECT_DIR)/bin +PROJECT_BIN = $(CURDIR)/bin $(shell [ -f bin ] || mkdir -p $(PROJECT_BIN)) GOLANGCI_LINT = $(PROJECT_BIN)/golangci-lint