Skip to content

Commit c83e0b9

Browse files
committed
Merge branch 'v3' into fix-panic-with-two-log-formats
2 parents fa763de + cfb3d58 commit c83e0b9

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,6 @@ jobs:
9090
strategy:
9191
matrix:
9292
container:
93-
- image: "ubuntu"
94-
version: "22.04"
9593
- image: "redhatenterprise"
9694
version: "9"
9795
- image: "alpine"

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ $(shell mkdir -p $(DIRS))
4949
VERSION ?= "v3.0.0"
5050
COMMIT = $(shell git rev-parse --short HEAD)
5151
DATE = $(shell date +%F_%H-%M-%S)
52-
LDFLAGS = "-w -X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.date=$(DATE)"
52+
LDFLAGS = "-s -w -X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.date=$(DATE)"
5353
DEBUG_LDFLAGS = "-X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.date=$(DATE)"
5454

5555
OSS_PACKAGES_REPO := "packages.nginx.org"
@@ -114,8 +114,9 @@ no-local-changes:
114114
git diff --quiet || { echo "Dependency changes detected. Please commit these before pushing." >&2; exit 1; }
115115

116116
build: ## Build agent executable
117+
@echo "🏗️ Building"
117118
mkdir -p $(BUILD_DIR)
118-
@GOARCH=$(OSARCH) $(GOBUILD) -o $(BUILD_DIR)/$(BINARY_NAME) -pgo=default.pgo -ldflags=$(LDFLAGS) $(PROJECT_DIR)/$(PROJECT_FILE)
119+
GOARCH=$(OSARCH) $(GOBUILD) -o $(BUILD_DIR)/$(BINARY_NAME) -pgo=default.pgo -ldflags=$(LDFLAGS) $(PROJECT_DIR)/$(PROJECT_FILE)
119120
@echo "📦 Build Done"
120121

121122
lint: ## Run linter

0 commit comments

Comments
 (0)