From f8ca792f68b03653734e4f09ac77660408207ca3 Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Tue, 14 May 2024 18:21:20 -0400 Subject: [PATCH] fix(teller) (#6140) * fix(teller) closes #6113 closes #6114 * +openssl+rust^1.78 --- projects/tlr.dev/package.yml | 42 +++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/projects/tlr.dev/package.yml b/projects/tlr.dev/package.yml index c09616ce..eca1413b 100644 --- a/projects/tlr.dev/package.yml +++ b/projects/tlr.dev/package.yml @@ -5,21 +5,28 @@ distributable: versions: github: SpectralOps/teller +dependencies: + openssl.org: ^1.1 + build: dependencies: go.dev: ^1.21 + rust-lang.org: ^1.78 script: - go build $ARGS -ldflags="$LDFLAGS" . + - run: go build $GO_ARGS -ldflags="$GO_LDFLAGS" . + if: <2 + - run: cargo install --locked --path teller-cli --root {{prefix}} + if: '>=2' env: - COMMIT_SHA: "$(git describe --always --abbrev=8 --dirty)" - VERSION_DATE: "$(date -u +%FT%TZ)" - ARGS: + COMMIT_SHA: '$(git describe --always --abbrev=8 --dirty)' + VERSION_DATE: '$(date -u +%FT%TZ)' + GO_ARGS: - -trimpath - -o={{prefix}}/bin/teller linux: - ARGS: + GO_ARGS: - -buildmode=pie - LDFLAGS: + GO_LDFLAGS: - -s - -w - -X main.version={{version}} @@ -30,9 +37,11 @@ provides: - bin/teller test: - - | - echo 'foo: var' > test.env - - run: teller -c $FIXTURE show 2>&1 | grep 'foo' + - run: | + echo 'foo: var' > test.env + teller -c $FIXTURE show 2>&1 | grep 'foo' + teller version | grep {{version}} + if: <2 fixture: content: | project: test @@ -43,4 +52,17 @@ test: env_sync: path: test.env extname: .yml - - teller version | grep {{version}} + - run: | + echo 'foo=var' > test.env + teller -c $FIXTURE show 2>&1 | grep 'foo' + test "$(teller --version)" = "teller {{version}}" + if: '>=2' + fixture: + content: | + providers: + dot_1: + kind: dotenv + maps: + - id: foo + path: test.env + extname: .yml