Skip to content

Commit 243f892

Browse files
authored
PMM-13959 remove GSSAPI from main builds (#4001)
1 parent 539320f commit 243f892

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

.github/workflows/main.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ jobs:
2929
go-version-file: ${{ github.workspace }}/go.mod
3030
cache: false
3131

32-
- name: Install kerberos development libraries
33-
run: |
34-
sudo apt-get update
35-
sudo apt-get install libkrb5-dev
36-
3732
- name: Enable Go build cache
3833
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
3934
with:

agent/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ VERSION_FLAGS = -X 'github.com/percona/pmm/version.ProjectName=pmm-agent' \
2525
-X 'github.com/percona/pmm/version.Branch=$(PMM_RELEASE_BRANCH)'
2626

2727
release: ## Build static pmm-agent release binary (Linux only)
28-
CGO_ENABLED=1 go build -v -ldflags "$(VERSION_FLAGS)" -tags 'osusergo netgo static_build gssapi' -o $(PMM_RELEASE_PATH)/pmm-agent
28+
CGO_ENABLED=1 go build -v -ldflags "-extldflags '-static' $(VERSION_FLAGS)" -tags 'osusergo netgo static_build' -o $(PMM_RELEASE_PATH)/pmm-agent
2929
go build -v -ldflags "-extldflags '-static' $(VERSION_FLAGS)" -tags 'osusergo netgo static_build' -o $(PMM_RELEASE_PATH)/pmm-agent-entrypoint ./cmd/pmm-agent-entrypoint
3030
$(PMM_RELEASE_PATH)/pmm-agent --version
31-
# ldd $(PMM_RELEASE_PATH)/pmm-agent 2>&1 | grep -Fq 'not a dynamic executable'
31+
ldd $(PMM_RELEASE_PATH)/pmm-agent 2>&1 | grep -Fq 'not a dynamic executable'
3232

3333
release-dev:
34-
CGO_ENABLED=1 go build -race -v -ldflags "$(VERSION_FLAGS)" -tags 'gssapi' -o $(PMM_RELEASE_PATH)/pmm-agent
34+
CGO_ENABLED=1 go build -race -v -ldflags "$(VERSION_FLAGS)" -o $(PMM_RELEASE_PATH)/pmm-agent
3535

3636
gen: clean ## Generate files
3737
go generate ./...

0 commit comments

Comments
 (0)