From f0ef970aa6daab6c909ea0b6f089a1cba4948d48 Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Wed, 3 Apr 2024 14:02:57 -0400 Subject: [PATCH] fix(pebble) closes #5782 --- .../github.com/canonical/pebble/package.yml | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/projects/github.com/canonical/pebble/package.yml b/projects/github.com/canonical/pebble/package.yml index 42d76b85..77dcfd48 100644 --- a/projects/github.com/canonical/pebble/package.yml +++ b/projects/github.com/canonical/pebble/package.yml @@ -10,9 +10,9 @@ versions: - /^v/ platforms: -# not compiling presently -# looks like canonical's fork of go-flags (several years old) doesn't support unix.Prctl properly on darwin -# - darwin + # not compiling presently + # looks like canonical's fork of go-flags (several years old) doesn't support unix.Prctl properly on darwin + # - darwin - linux build: @@ -24,16 +24,23 @@ build: env: CGO_ENABLED: 0 LDFLAGS: - - -w - - -s + - -w + - -s linux: LDFLAGS: - - -buildmode=pie + - -buildmode=pie script: - - go generate ./cmd - - go build -v -ldflags="${LDFLAGS}" -o "{{ prefix }}/bin/pebble" --trimpath ./cmd/pebble + - go generate ./cmd + - run: sed -i 's/Version = ".*"/Version = "v{{version}}"/' version_generated.go + working-directory: cmd + if: <1.2 + - go build -v -ldflags="${LDFLAGS}" -o "{{ prefix }}/bin/pebble" --trimpath ./cmd/pebble provides: -- bin/pebble + - bin/pebble -test: test "$(pebble version --client)" = v{{version}} +test: + - run: pebble version | grep 'client v{{version}}' + if: <1.2 + - run: test "$(pebble version --client)" = v{{version}} + if: '>=1.2'