Skip to content

feat: update go modules to match repostitory org #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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: update go modules to match repostitory org #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TEST?=$$(go list ./... |grep -v 'vendor')
GOFMT_FILES?=$$(find . -name '*.go' |grep -v vendor)
TARGETS=darwin linux windows
TARGETS=darwin_amd64 linux_amd64 windows_amd64 darwin_arm64 linux_arm64
WEBSITE_REPO=github.com/hashicorp/terraform-website
PKG_NAME=circleci

Expand All @@ -12,8 +12,11 @@ build: fmtcheck
targets: $(TARGETS)

$(TARGETS):
GOOS=$@ GOARCH=amd64 CGO_ENABLED=0 go build -o "dist/terraform-provider-circleci_$$(git describe --tags)_$@_amd64"
zip -j dist/terraform-provider-circleci_$$(git describe --tags)_$@_amd64.zip dist/terraform-provider-circleci_$$(git describe --tags)_$@_amd64
@os=$$(echo $@ | cut -d'_' -f1); \
arch=$$(echo $@ | cut -d'_' -f2); \
output="dist/terraform-provider-$(PKG_NAME)_$$(git describe --tags)_$${os}_$${arch}"; \
GOOS=$$os GOARCH=$$arch CGO_ENABLED=0 go build -o "$$output"; \
zip -j "$${output}.zip" "$$output"

test: fmtcheck
go test -i $(TEST) || exit 1
Expand Down
2 changes: 1 addition & 1 deletion circleci/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package circleci

import (
circleci "github.com/edahlseng/terraform-provider-circleci/circleci/circleci-go"
circleci "github.com/shapertools/terraform-provider-circleci/circleci/circleci-go"
)

type Config struct {
Expand Down
5 changes: 3 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
module github.com/edahlseng/terraform-provider-circleci
module github.com/shapertools/terraform-provider-circleci

go 1.12

require (
github.com/dghubble/sling v1.2.0
github.com/hashicorp/terraform v0.11.13
github.com/edahlseng/terraform-provider-circleci v0.3.0
github.com/hashicorp/terraform v0.12.9
)
Loading