diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..15114cb --- /dev/null +++ b/.dockerignore @@ -0,0 +1,3 @@ +Dockerfile* +LICENSE +README.md diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..a0a2867 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +--- +version: 2 +updates: + - package-ecosystem: "docker" + directory: "/" + schedule: + interval: "daily" + - package-ecosystem: "gomod" + directory: "/" + schedule: + interval: "daily" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..d99005d --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,44 @@ +--- +name: CI + +on: + pull_request: + branches: + - '*' + push: + branches: + - 'master' + - 'release' + +jobs: + build: + name: build + runs-on: ubuntu-18.04 + strategy: + fail-fast: true + env: + GITHUB_ACCESS_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }} + PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }} + + steps: + - uses: actions/checkout@v2 + - name: make version + run: | + make version .env.docker + - run: make ci-report + - run: make build-docker-image + - run: make build-in-docker + - run: make validate-in-docker + - name: upload packages + uses: actions/upload-artifact@v2 + with: + name: build + path: build/**/* + - name: make release-in-docker + run: | + if [[ "${GITHUB_REF#refs/heads/}" == "release" ]]; then + export CI_BRANCH=${GITHUB_REF#refs/heads/} + export PACKAGECLOUD_REPOSITORY=dokku/dokku + rm .env.docker + make .env.docker release-in-docker release-packagecloud-in-docker + fi diff --git a/.gitignore b/.gitignore index efb1112..2e32d37 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,3 @@ validation/* # .env files .env* - -build -site diff --git a/CHANGELOG.md b/CHANGELOG.md index 7658e7e..45b0835 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,22 +1,24 @@ # Change Log All notable changes to this project will be documented in this file. -## [Unreleased][unreleased] +## [v0.7.0](https://github.com/gliderlabs/registrator/compare/v0.6.0...v0.7.0) - 2020-10-28 + ### Fixed +- #56 @0xflotus Fix typo in readme + ### Added -### Removed +- #58: @josegonzalez Add arm support +- #57: @adam12 Add bullseye to deb release task -### Changed - -## [v0.6.0] - 2020-05-06 +## [v0.6.0](https://github.com/gliderlabs/registrator/compare/v0.5.0...v0.6.0) - 2020-05-06 ### Added - #53: @josegonzalez Release packages for Focal Fossa -## [v0.5.0] - 2020-03-13 +## [v0.5.0](https://github.com/gliderlabs/registrator/compare/v0.4.0...v0.5.0) - 2020-03-13 ### Fixed - #19: @stormcat24 Use correct protocol for download url @@ -37,7 +39,3 @@ All notable changes to this project will be documented in this file. - @josegonzalez Upgrade to circleci 2.1 - @josegonzalez Upgrade to golang 1.13.8 - -[unreleased]: https://github.com/gliderlabs/registrator/compare/v0.6.0...HEAD -[v0.6.0]: https://github.com/gliderlabs/registrator/compare/v0.6.0...v0.5.0 -[v0.5.0]: https://github.com/gliderlabs/registrator/compare/v0.5.0...v0.4.0 diff --git a/Dockerfile.build b/Dockerfile.build new file mode 100644 index 0000000..7eddc07 --- /dev/null +++ b/Dockerfile.build @@ -0,0 +1,13 @@ +FROM golang:1.17.2-buster + +RUN apt-get update \ + && apt install apt-transport-https build-essential curl gnupg2 lintian rpm rsync rubygems-integration ruby-dev ruby -qy \ + && git clone https://github.com/bats-core/bats-core.git /tmp/bats-core \ + && cd /tmp/bats-core \ + && ./install.sh /usr/local \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +RUN gem install --no-ri --no-rdoc --quiet rake fpm package_cloud + +WORKDIR /src diff --git a/Dockerfile.hub b/Dockerfile.hub new file mode 100644 index 0000000..f694e20 --- /dev/null +++ b/Dockerfile.hub @@ -0,0 +1,3 @@ +FROM scratch +COPY ./build/linux/gliderlabs-sigil-amd64 /gliderlabs-sigil +ENTRYPOINT ["/gliderlabs-sigil"] diff --git a/Makefile b/Makefile index b2fc562..d14aa8c 100644 --- a/Makefile +++ b/Makefile @@ -1,73 +1,208 @@ -NAME=sigil -ARCH=$(shell uname -m) -ORG=gliderlabs -VERSION=0.6.0 -define DESCRIPTION +NAME = gliderlabs-sigil +EMAIL = sigil@josediazgonzalez.com +MAINTAINER = gliderlabs +MAINTAINER_NAME = Jose Diaz-Gonzalez +REPOSITORY = sigil +HARDWARE = $(shell uname -m) +SYSTEM_NAME = $(shell uname -s | tr '[:upper:]' '[:lower:]') +BASE_VERSION ?= 0.7.0 +IMAGE_NAME ?= $(MAINTAINER)/$(REPOSITORY) +PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish + +ifeq ($(CI_BRANCH),release) + VERSION ?= $(BASE_VERSION) + DOCKER_IMAGE_VERSION = $(VERSION) +else + VERSION = $(shell echo "${BASE_VERSION}")build+$(shell git rev-parse --short HEAD) + DOCKER_IMAGE_VERSION = $(shell echo "${BASE_VERSION}")build-$(shell git rev-parse --short HEAD) +endif + +version: + @echo "$(CI_BRANCH)" + @echo "$(VERSION)" + +define PACKAGE_DESCRIPTION Standalone string interpolator and template processor Sigil is a command line tool for template processing and POSIX-compliant variable expansion. It was created for configuration templating, but can be used for any text processing. endef -REPO_NAME ?= gliderlabs/sigil -ARCHITECTURE = amd64 -export DESCRIPTION +export PACKAGE_DESCRIPTION -build: - glu build darwin,linux ./cmd -ifdef CIRCLECI - sudo chown -R circleci:circleci build -endif - $(MAKE) deb - $(MAKE) rpm +LIST = build release release-packagecloud validate +targets = $(addsuffix -in-docker, $(LIST)) -test: - basht tests/*.bash +.env.docker: + @rm -f .env.docker + @touch .env.docker + @echo "CI_BRANCH=$(CI_BRANCH)" >> .env.docker + @echo "GITHUB_ACCESS_TOKEN=$(GITHUB_ACCESS_TOKEN)" >> .env.docker + @echo "IMAGE_NAME=$(IMAGE_NAME)" >> .env.docker + @echo "PACKAGECLOUD_REPOSITORY=$(PACKAGECLOUD_REPOSITORY)" >> .env.docker + @echo "PACKAGECLOUD_TOKEN=$(PACKAGECLOUD_TOKEN)" >> .env.docker + @echo "VERSION=$(VERSION)" >> .env.docker -install: build - install build/$(shell uname -s)/$(NAME) /usr/local/bin +build: prebuild + @$(MAKE) build/darwin/$(NAME) + @$(MAKE) build/linux/$(NAME)-amd64 + @$(MAKE) build/linux/$(NAME)-armhf + @$(MAKE) build/deb/$(NAME)_$(VERSION)_amd64.deb + @$(MAKE) build/deb/$(NAME)_$(VERSION)_armhf.deb + @$(MAKE) build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm -deps: - go get github.com/gliderlabs/glu - go get -u github.com/progrium/basht/... - go get -d ./cmd +build-docker-image: + docker build --rm -q -f Dockerfile.build -t $(IMAGE_NAME):build . + +$(targets): %-in-docker: .env.docker + docker run \ + --env-file .env.docker \ + --rm \ + --volume /var/lib/docker:/var/lib/docker \ + --volume /var/run/docker.sock:/var/run/docker.sock:ro \ + --volume /usr/bin/docker:/usr/local/bin/docker \ + --volume ${PWD}:/src/github.com/$(MAINTAINER)/$(REPOSITORY) \ + --workdir /src/github.com/$(MAINTAINER)/$(REPOSITORY) \ + $(IMAGE_NAME):build make -e $(@:-in-docker=) + +build/darwin/$(NAME): + mkdir -p build/darwin + CGO_ENABLED=0 GOOS=darwin go build -a -asmflags=-trimpath=/src -gcflags=-trimpath=/src \ + -ldflags "-s -w -X main.Version=$(VERSION)" \ + -o build/darwin/$(NAME) cmd/sigil.go + +build/linux/$(NAME)-amd64: + mkdir -p build/linux + CGO_ENABLED=0 GOOS=linux go build -a -asmflags=-trimpath=/src -gcflags=-trimpath=/src \ + -ldflags "-s -w -X main.Version=$(VERSION)" \ + -o build/linux/$(NAME)-amd64 cmd/sigil.go + +build/linux/$(NAME)-armhf: + mkdir -p build/linux + CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=5 go build -a -asmflags=-trimpath=/src -gcflags=-trimpath=/src \ + -ldflags "-s -w -X main.Version=$(VERSION)" \ + -o build/linux/$(NAME)-armhf cmd/sigil.go + +build/deb/$(NAME)_$(VERSION)_amd64.deb: build/linux/$(NAME)-amd64 + export SOURCE_DATE_EPOCH=$(shell git log -1 --format=%ct) \ + && mkdir -p build/deb \ + && fpm \ + --architecture amd64 \ + --category utils \ + --description "$$PACKAGE_DESCRIPTION" \ + --input-type dir \ + --license 'MIT License' \ + --maintainer "$(MAINTAINER_NAME) <$(EMAIL)>" \ + --name $(NAME) \ + --output-type deb \ + --package build/deb/$(NAME)_$(VERSION)_amd64.deb \ + --url "https://github.com/$(MAINTAINER)/$(REPOSITORY)" \ + --vendor "" \ + --version $(VERSION) \ + --verbose \ + build/linux/$(NAME)-amd64=/usr/bin/$(NAME) \ + LICENSE=/usr/share/doc/$(NAME)/copyright -release: - glu release v$(VERSION) - package_cloud push "dokku/dokku/ubuntu/xenial" build/deb/$(subst /,_,$(REPO_NAME))_$(VERSION)_amd64.deb - package_cloud push "dokku/dokku/ubuntu/bionic" build/deb/$(subst /,_,$(REPO_NAME))_$(VERSION)_amd64.deb - package_cloud push "dokku/dokku/ubuntu/focal" build/deb/$(subst /,_,$(REPO_NAME))_$(VERSION)_amd64.deb - package_cloud push "dokku/dokku/debian/buster" build/deb/$(subst /,_,$(REPO_NAME))_$(VERSION)_amd64.deb - package_cloud push "dokku/dokku/debian/stretch" build/deb/$(subst /,_,$(REPO_NAME))_$(VERSION)_amd64.deb - package_cloud push "dokku/dokku/el/7" build/rpm/$(subst /,-,$(REPO_NAME))-$(VERSION)-1.x86_64.rpm +build/deb/$(NAME)_$(VERSION)_armhf.deb: build/linux/$(NAME)-armhf + export SOURCE_DATE_EPOCH=$(shell git log -1 --format=%ct) \ + && mkdir -p build/deb \ + && fpm \ + --architecture armhf \ + --category utils \ + --description "$$PACKAGE_DESCRIPTION" \ + --input-type dir \ + --license 'MIT License' \ + --maintainer "$(MAINTAINER_NAME) <$(EMAIL)>" \ + --name $(NAME) \ + --output-type deb \ + --package build/deb/$(NAME)_$(VERSION)_armhf.deb \ + --url "https://github.com/$(MAINTAINER)/$(REPOSITORY)" \ + --vendor "" \ + --version $(VERSION) \ + --verbose \ + build/linux/$(NAME)-armhf=/usr/bin/$(NAME) \ + LICENSE=/usr/share/doc/$(NAME)/copyright + +build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm: build/linux/$(NAME)-amd64 + export SOURCE_DATE_EPOCH=$(shell git log -1 --format=%ct) \ + && mkdir -p build/rpm \ + && fpm \ + --architecture x86_64 \ + --category utils \ + --description "$$PACKAGE_DESCRIPTION" \ + --input-type dir \ + --license 'MIT License' \ + --maintainer "$(MAINTAINER_NAME) <$(EMAIL)>" \ + --name $(NAME) \ + --output-type rpm \ + --package build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm \ + --rpm-os linux \ + --url "https://github.com/$(MAINTAINER)/$(REPOSITORY)" \ + --vendor "" \ + --version $(VERSION) \ + --verbose \ + build/linux/$(NAME)-amd64=/usr/bin/$(NAME) \ + LICENSE=/usr/share/doc/$(NAME)/copyright clean: - rm -rf build release - -.PHONY: build release - -deb: - mkdir -p build/deb - fpm -t deb -s dir -n $(subst /,-,$(REPO_NAME)) \ - --version $(VERSION) \ - --architecture amd64 \ - --package build/deb/$(subst /,_,$(REPO_NAME))_$(VERSION)_amd64.deb \ - --url "https://github.com/$(REPO_NAME)" \ - --maintainer "Jose Diaz-Gonzalez " \ - --category utils \ - --description "$$DESCRIPTION" \ - --license 'MIT License' \ - build/Linux/sigil=/usr/bin/$(NAME) - -rpm: - mkdir -p build/rpm - fpm -t rpm -s dir -n $(subst /,-,$(REPO_NAME)) \ - --version $(VERSION) \ - --architecture x86_64 \ - --package build/rpm/$(subst /,-,$(REPO_NAME))-$(VERSION)-1.x86_64.rpm \ - --url "https://github.com/$(REPO_NAME)" \ - --category utils \ - --description "$$DESCRIPTION" \ - --license 'MIT License' \ - build/Linux/sigil=/usr/bin/$(NAME) + rm -rf build release validation + +ci-report: + docker version + rm -f ~/.gitconfig + +docker-image: + docker build --rm -q -f Dockerfile.hub -t $(IMAGE_NAME):$(DOCKER_IMAGE_VERSION) . + +bin/gh-release: + mkdir -p bin + curl -o bin/gh-release.tgz -sL https://github.com/progrium/gh-release/releases/download/v2.3.3/gh-release_2.3.3_$(SYSTEM_NAME)_$(HARDWARE).tgz + tar xf bin/gh-release.tgz -C bin + chmod +x bin/gh-release + +release: build bin/gh-release + rm -rf release && mkdir release + tar -zcf release/$(NAME)_$(VERSION)_linux_amd64.tgz -C build/linux $(NAME)-amd64 + tar -zcf release/$(NAME)_$(VERSION)_linux_armhf.tgz -C build/linux $(NAME)-armhf + tar -zcf release/$(NAME)_$(VERSION)_darwin_$(HARDWARE).tgz -C build/darwin $(NAME) + cp build/deb/$(NAME)_$(VERSION)_amd64.deb release/$(NAME)_$(VERSION)_amd64.deb + cp build/deb/$(NAME)_$(VERSION)_armhf.deb release/$(NAME)_$(VERSION)_armhf.deb + cp build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm release/$(NAME)-$(VERSION)-1.x86_64.rpm + bin/gh-release create $(MAINTAINER)/$(REPOSITORY) $(VERSION) $(shell git rev-parse --abbrev-ref HEAD) + +release-packagecloud: + @$(MAKE) release-packagecloud-deb + @$(MAKE) release-packagecloud-rpm + +release-packagecloud-deb: build/deb/$(NAME)_$(VERSION)_amd64.deb build/deb/$(NAME)_$(VERSION)_armhf.deb + package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/bionic build/deb/$(NAME)_$(VERSION)_amd64.deb + package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/focal build/deb/$(NAME)_$(VERSION)_amd64.deb + package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/stretch build/deb/$(NAME)_$(VERSION)_amd64.deb + package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/buster build/deb/$(NAME)_$(VERSION)_amd64.deb + package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/bullseye build/deb/$(NAME)_$(VERSION)_amd64.deb + package_cloud push $(PACKAGECLOUD_REPOSITORY)/raspbian/buster build/deb/$(NAME)_$(VERSION)_armhf.deb + +release-packagecloud-rpm: build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm + package_cloud push $(PACKAGECLOUD_REPOSITORY)/el/7 build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm + +validate: + mkdir -p validation + lintian build/deb/$(NAME)_$(VERSION)_amd64.deb || true + lintian build/deb/$(NAME)_$(VERSION)_armhf.deb || true + dpkg-deb --info build/deb/$(NAME)_$(VERSION)_amd64.deb + dpkg-deb --info build/deb/$(NAME)_$(VERSION)_armhf.deb + dpkg -c build/deb/$(NAME)_$(VERSION)_amd64.deb + dpkg -c build/deb/$(NAME)_$(VERSION)_armhf.deb + cd validation && ar -x ../build/deb/$(NAME)_$(VERSION)_amd64.deb + cd validation && ar -x ../build/deb/$(NAME)_$(VERSION)_armhf.deb + cd validation && rpm2cpio ../build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm > $(NAME)-$(VERSION)-1.x86_64.cpio + ls -lah build/deb build/rpm validation + sha1sum build/deb/$(NAME)_$(VERSION)_amd64.deb + sha1sum build/deb/$(NAME)_$(VERSION)_armhf.deb + sha1sum build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm + go get -u github.com/progrium/basht/... + basht tests/*.bash + +prebuild: + true diff --git a/README.md b/README.md index bd43cdd..e580bc8 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ for any text processing. ## Getting Sigil ```shell -curl -L "https://github.com/gliderlabs/sigil/releases/download/v0.6.0/sigil_0.6.0_$(uname -sm|tr \ _).tgz" \ +curl -L "https://github.com/gliderlabs/sigil/releases/download/v0.7.0/gliderlabs-sigil_0.7.0_$(uname -sm|tr \ _).tgz" \ | tar -zxC /usr/local/bin ``` @@ -64,7 +64,7 @@ Sometimes you want to use sigil to generate text, which uses golang templating i For example if you want to generate [packer](https://www.packer.io/docs/) configuration your template might contain a lot of `{{` and `}}`. -Intead of replacing all `{{` with `{{“{{”}}`, you can change the delimiters, +Instead of replacing all `{{` with `{{“{{”}}`, you can change the delimiters, by setting the `SIGIL_DELIMS` environment variable. It is the left and right delimiter strings, separated by a coma. diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..acf5a9e --- /dev/null +++ b/go.mod @@ -0,0 +1,14 @@ +module sigil + +go 1.17 + +require ( + github.com/dustin/go-jsonpointer v0.0.0-20160814072949-ba0abeacc3dc + github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 + github.com/gliderlabs/sigil v0.6.0 + github.com/jmespath/go-jmespath v0.4.0 + github.com/mgood/go-posix v0.0.0-20150821180505-948c005421f5 + gopkg.in/yaml.v2 v2.4.0 +) + +require github.com/dustin/gojson v0.0.0-20160307161227-2e71ec9dd5ad // indirect diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..46cca1c --- /dev/null +++ b/go.sum @@ -0,0 +1,24 @@ +github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dustin/go-jsonpointer v0.0.0-20160814072949-ba0abeacc3dc h1:tP7tkU+vIsEOKiK+l/NSLN4uUtkyuxc6hgYpQeCWAeI= +github.com/dustin/go-jsonpointer v0.0.0-20160814072949-ba0abeacc3dc/go.mod h1:ORH5Qp2bskd9NzSfKqAF7tKfONsEkCarTE5ESr/RVBw= +github.com/dustin/gojson v0.0.0-20160307161227-2e71ec9dd5ad h1:Qk76DOWdOp+GlyDKBAG3Klr9cn7N+LcYc82AZ2S7+cA= +github.com/dustin/gojson v0.0.0-20160307161227-2e71ec9dd5ad/go.mod h1:mPKfmRa823oBIgl2r20LeMSpTAteW5j7FLkc0vjmzyQ= +github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= +github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= +github.com/gliderlabs/sigil v0.6.0 h1:nrkh9J1/izJtWuOcV9C+cLeNVYcqWCMCeq+MIIdXDmQ= +github.com/gliderlabs/sigil v0.6.0/go.mod h1:1h7H4biRwXmWY82OZkXIQp8WTwxX5/TwJPwVNKT1J2E= +github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= +github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= +github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= +github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= +github.com/mgood/go-posix v0.0.0-20150821180505-948c005421f5 h1:AutzcJSqc7ROMqcjPKmxwLl//YrzDPb4tLSBlH3Irdc= +github.com/mgood/go-posix v0.0.0-20150821180505-948c005421f5/go.mod h1:irVTeKOI2GrudEK6/mqR4dDlGH91lCZIZM34YKSKH7M= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/tests/sigil.bash b/tests/sigil.bash index dd6f4cd..1b16790 100644 --- a/tests/sigil.bash +++ b/tests/sigil.bash @@ -1,5 +1,5 @@ GOOS=$(go env GOOS) -export SIGIL="${SIGIL:-build/${GOOS^}/sigil}" +export SIGIL="${SIGIL:-build/${GOOS}/gliderlabs-sigil}-amd64" T_posix_var() { result=$(echo 'Hello, $name' | $SIGIL -p name=Jeff)