Skip to content

Use latest broadcom sprig nov 30 2023 v2 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fs895472 merged 2 commits into from
Nov 30, 2023
Merged

Use latest broadcom sprig nov 30 2023 v2 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0903634
Merge pull request #1 from fs895472/use-latest-broadcom-sprig_nov-30-…
fs895472 Nov 30, 2023
d6fd94d
update sprig version and remove parent gotpl repo reference
fs895472 Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ tidy:

.PHONY: build
build: tidy
GOBIN=$(BINDIR) $(GO) install -ldflags '$(LDFLAGS)' github.com/belitre/gotpl/...
GOBIN=$(BINDIR) $(GO) install -ldflags '$(LDFLAGS)' github.com/Broadcom/gotpl-titans/...

# usage: make clean build-cross dist VERSION=v0.2-alpha
.PHONY: build-cross
build-cross: LDFLAGS += -extldflags "-static"
build-cross:
CGO_ENABLED=0 gox -parallel=3 -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' -ldflags '$(LDFLAGS)' github.com/belitre/gotpl
CGO_ENABLED=0 gox -parallel=3 -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' -ldflags '$(LDFLAGS)' github.com/Broadcom/gotpl-titans

.PHONY: dist
dist:
Expand Down
4 changes: 2 additions & 2 deletions commands/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"os"

"github.com/belitre/gotpl/commands/options"
"github.com/belitre/gotpl/tpl"
"github.com/Broadcom/gotpl-titans/commands/options"
"github.com/Broadcom/gotpl-titans/tpl"
"github.com/spf13/cobra"
)

Expand Down
9 changes: 6 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@ module github.com/Broadcom/gotpl-titans
go 1.13

require (
github.com/Broadcom/sprig v0.0.0-20231130055555-330ee0490efe
github.com/belitre/gotpl v0.0.0-20200305160433-cfded0e75742
github.com/Broadcom/sprig v0.0.0-20231130070859-911ac6946898
github.com/Masterminds/semver v1.5.0 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/ghodss/yaml v1.0.0
github.com/gobwas/glob v0.2.3 // indirect
github.com/otiai10/copy v1.0.2
github.com/spf13/cobra v1.2.1
github.com/stretchr/testify v1.7.0
github.com/stretchr/testify v1.8.2
k8s.io/apimachinery v0.28.4 // indirect
k8s.io/helm v2.16.1+incompatible
)
257 changes: 162 additions & 95 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"github.com/belitre/gotpl/commands"
"github.com/Broadcom/gotpl-titans/commands"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion tpl/tpl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"strings"
"text/template"

"github.com/Broadcom/gotpl-titans/commands/options"
"github.com/Broadcom/sprig"
"github.com/belitre/gotpl/commands/options"
"github.com/ghodss/yaml"
"github.com/otiai10/copy"
"k8s.io/helm/pkg/chartutil"
Expand Down
2 changes: 1 addition & 1 deletion tpl/tpl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"testing"

"github.com/belitre/gotpl/commands/options"
"github.com/Broadcom/gotpl-titans/commands/options"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions versioning.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ BINARY_VERSION ?= ${GIT_TAG}

# Only set Version if building a tag or VERSION is set
ifneq ($(BINARY_VERSION),)
LDFLAGS += -X github.com/belitre/gotpl/commands.Version=${BINARY_VERSION}
LDFLAGS += -X github.com/Broadcom/gotpl-titans/commands.Version=${BINARY_VERSION}
endif

LDFLAGS += -X github.com/belitre/gotpl/commands.GitCommit=${GIT_COMMIT}
LDFLAGS += -X github.com/Broadcom/gotpl-titans/commands.GitCommit=${GIT_COMMIT}

info:
@echo "Version: ${VERSION}"
Expand Down