summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorDan Duvall <dduvall@wikimedia.org>2017-09-13 22:39:59 -0700
committerDan Duvall <dduvall@wikimedia.org>2017-09-14 09:20:58 -0700
commit6766ee4e74b25036d29a2e5e8f6eaf19969cf825 (patch)
treedabc98cab520d2d22198ff0af557b1c7c790d6f1 /docker
parent4e5c728eec5a8d7a3f4297de6b5c1503bdffd5d0 (diff)
downloadblubber-6766ee4e74b25036d29a2e5e8f6eaf19969cf825.tar.gz
Use import paths without `.git` suffix
Summary: Now that our Phabricator instance handles `go get` requests, we can use a path without the `.git` suffix as the canonical import path. Test Plan: Run `go test ./...` and `go build`. Reviewers: thcipriani, #release-engineering-team Reviewed By: thcipriani, #release-engineering-team Tags: #release-engineering-team Differential Revision: https://phabricator.wikimedia.org/D780
Diffstat (limited to 'docker')
-rw-r--r--docker/compiler.go4
-rw-r--r--docker/compiler_test.go4
-rw-r--r--docker/instructions.go2
-rw-r--r--docker/instructions_test.go5
4 files changed, 8 insertions, 7 deletions
diff --git a/docker/compiler.go b/docker/compiler.go
index d7043a0..e23731c 100644
--- a/docker/compiler.go
+++ b/docker/compiler.go
@@ -5,8 +5,8 @@ import (
"log"
"strings"
- "phabricator.wikimedia.org/source/blubber.git/build"
- "phabricator.wikimedia.org/source/blubber.git/config"
+ "phabricator.wikimedia.org/source/blubber/build"
+ "phabricator.wikimedia.org/source/blubber/config"
)
func Compile(cfg *config.Config, variant string) *bytes.Buffer {
diff --git a/docker/compiler_test.go b/docker/compiler_test.go
index 0d327cb..da2fe17 100644
--- a/docker/compiler_test.go
+++ b/docker/compiler_test.go
@@ -6,8 +6,8 @@ import (
"gopkg.in/stretchr/testify.v1/assert"
- "phabricator.wikimedia.org/source/blubber.git/config"
- "phabricator.wikimedia.org/source/blubber.git/docker"
+ "phabricator.wikimedia.org/source/blubber/config"
+ "phabricator.wikimedia.org/source/blubber/docker"
)
func TestSingleStageHasNoName(t *testing.T) {
diff --git a/docker/instructions.go b/docker/instructions.go
index 4edcb23..fa566cb 100644
--- a/docker/instructions.go
+++ b/docker/instructions.go
@@ -5,7 +5,7 @@ import (
"fmt"
"strings"
- "phabricator.wikimedia.org/source/blubber.git/build"
+ "phabricator.wikimedia.org/source/blubber/build"
)
func NewDockerInstruction(instruction build.Instruction) (DockerInstruction, error) {
diff --git a/docker/instructions_test.go b/docker/instructions_test.go
index 10cc1ab..4325cbd 100644
--- a/docker/instructions_test.go
+++ b/docker/instructions_test.go
@@ -4,8 +4,9 @@ import (
"testing"
"gopkg.in/stretchr/testify.v1/assert"
- "phabricator.wikimedia.org/source/blubber.git/build"
- "phabricator.wikimedia.org/source/blubber.git/docker"
+
+ "phabricator.wikimedia.org/source/blubber/build"
+ "phabricator.wikimedia.org/source/blubber/docker"
)
func TestRun(t *testing.T) {