Skip to content
This repository was archived by the owner on Mar 24, 2023. It is now read-only.

Commit 6203be1

Browse files
dexhorthydexhorthy
committed
fix packages, no yoonit
1 parent 8068d6c commit 6203be1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+155
-157
lines changed

‎.circleci/config.yml

+3-5
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
test:
1414
docker:
1515
- image: circleci/golang:1.9
16-
working_directory: /go/src/github.com/replicatedcom/ship
16+
working_directory: /go/src/github.com/replicatedhq/ship
1717
steps:
1818
- checkout
1919
- run: make build-deps test
@@ -29,7 +29,7 @@ jobs:
2929
deploy_unstable:
3030
docker:
3131
- image: circleci/golang:1.9
32-
working_directory: /go/src/github.com/replicatedcom/ship
32+
working_directory: /go/src/github.com/replicatedhq/ship
3333
steps:
3434
- checkout
3535
- setup_remote_docker
@@ -43,7 +43,7 @@ jobs:
4343
deploy:
4444
docker:
4545
- image: circleci/golang:1.9
46-
working_directory: /go/src/github.com/replicatedcom/ship
46+
working_directory: /go/src/github.com/replicatedhq/ship
4747
steps:
4848
- checkout
4949
- setup_remote_docker
@@ -57,15 +57,13 @@ workflows:
5757
version: 2
5858
build_accept_deploy:
5959
jobs:
60-
- test_yoonit
6160
- test:
6261
filters:
6362
tags:
6463
only: /.*/
6564
- deploy_unstable:
6665
requires:
6766
- test
68-
- test_yoonit
6967
filters:
7068
branches:
7169
only: /master/

‎.goreleaser.unstable.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
project_name: ship
22
release:
33
github:
4-
owner: replicatedcom
4+
owner: replicatedhq
55
name: ship
66
builds:
77
- goos:
@@ -13,9 +13,9 @@ builds:
1313
- CGO_ENABLED=0
1414
main: cmd/ship/main.go
1515
ldflags: -s -w
16-
-X github.com/replicatedcom/ship/pkg/version.version={{.Version}}
17-
-X github.com/replicatedcom/ship/pkg/version.gitSHA={{.Commit}}
18-
-X github.com/replicatedcom/ship/pkg/version.buildTime={{.Date}}
16+
-X github.com/replicatedhq/ship/pkg/version.version={{.Version}}
17+
-X github.com/replicatedhq/ship/pkg/version.gitSHA={{.Commit}}
18+
-X github.com/replicatedhq/ship/pkg/version.buildTime={{.Date}}
1919
-extldflags "-static"
2020
flags: -tags netgo -installsuffix netgo
2121
binary: ship

‎.goreleaser.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
project_name: ship
22
release:
33
github:
4-
owner: replicatedcom
4+
owner: replicatedhq
55
name: ship
66
builds:
77
- goos:
@@ -13,9 +13,9 @@ builds:
1313
- CGO_ENABLED=0
1414
main: cmd/ship/main.go
1515
ldflags: -s -w
16-
-X github.com/replicatedcom/ship/pkg/version.version={{.Version}}
17-
-X github.com/replicatedcom/ship/pkg/version.gitSHA={{.Commit}}
18-
-X github.com/replicatedcom/ship/pkg/version.buildTime={{.Date}}
16+
-X github.com/replicatedhq/ship/pkg/version.version={{.Version}}
17+
-X github.com/replicatedhq/ship/pkg/version.gitSHA={{.Commit}}
18+
-X github.com/replicatedhq/ship/pkg/version.buildTime={{.Date}}
1919
-extldflags "-static"
2020
flags: -tags netgo -installsuffix netgo
2121
binary: ship

‎.wmconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"pointer": "replicatedcom__ship",
2+
"pointer": "replicatedhq__ship",
33
"ignorePatterns": [
44
".circleci/**",
55
".git/**",

‎BUILD.mill

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
load('go', 'go_create_tree', 'go_fmt', 'go_vet', 'go_build', 'go_test')
44

55
def main(s):
6-
root_package = "github.com/replicatedcom/ship"
6+
root_package = "github.com/replicatedhq/ship"
77
tree = go_create_tree(s, root_package)
88

99
j = new_job_set()

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
1515
RUN curl -sL https://deb.nodesource.com/setup_8.x | bash - && \
1616
apt-get install -y nodejs
1717

18-
ENV PROJECTPATH=/go/src/github.com/replicatedcom/ship
18+
ENV PROJECTPATH=/go/src/github.com/replicatedhq/ship
1919

2020
WORKDIR $PROJECTPATH
2121
CMD ["/bin/bash"]

‎Makefile

+7-7
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ shell:
1919
-p 8880:8880 \
2020
-v `pwd`/out:/out \
2121
-v /var/run/docker.sock:/var/run/docker.sock \
22-
-v `pwd`:/go/src/github.com/replicatedcom/ship \
22+
-v `pwd`:/go/src/github.com/replicatedhq/ship \
2323
ship
2424

2525
githooks:
@@ -32,32 +32,32 @@ _mockgen:
3232
mockgen \
3333
-destination pkg/test-mocks/config/resolver.go \
3434
-package config \
35-
github.com/replicatedcom/ship/pkg/lifecycle/render/config \
35+
github.com/replicatedhq/ship/pkg/lifecycle/render/config \
3636
Resolver
3737
mockgen \
3838
-destination pkg/test-mocks/config/daemon.go \
3939
-package config \
40-
github.com/replicatedcom/ship/pkg/lifecycle/render/config \
40+
github.com/replicatedhq/ship/pkg/lifecycle/render/config \
4141
Daemon
4242
mockgen \
4343
-destination pkg/test-mocks/planner/planner_mock.go \
4444
-package planner \
45-
github.com/replicatedcom/ship/pkg/lifecycle/render/planner \
45+
github.com/replicatedhq/ship/pkg/lifecycle/render/planner \
4646
Planner
4747
mockgen \
4848
-destination pkg/test-mocks/docker/image_saver_mock.go \
4949
-package docker \
50-
github.com/replicatedcom/ship/pkg/lifecycle/render/docker \
50+
github.com/replicatedhq/ship/pkg/lifecycle/render/docker \
5151
ImageSaver
5252
mockgen \
5353
-destination pkg/test-mocks/docker/image_manager_mock.go \
5454
-package docker \
55-
github.com/replicatedcom/ship/pkg/lifecycle/render/docker \
55+
github.com/replicatedhq/ship/pkg/lifecycle/render/docker \
5656
ImageManager
5757
mockgen \
5858
-destination pkg/test-mocks/docker/pull_url_resovler_mock.go \
5959
-package docker \
60-
github.com/replicatedcom/ship/pkg/lifecycle/render/docker \
60+
github.com/replicatedhq/ship/pkg/lifecycle/render/docker \
6161
PullURLResolver
6262

6363
mockgen: _mockgen fmt

‎cmd/hack-docs/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55

66
"github.com/mcuadros/go-jsonschema-generator"
7-
"github.com/replicatedcom/ship/pkg/api"
7+
"github.com/replicatedhq/ship/pkg/api"
88
)
99

1010
func main() {

‎cmd/ship/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package main
22

3-
import "github.com/replicatedcom/ship/pkg/cli"
3+
import "github.com/replicatedhq/ship/pkg/cli"
44

55
func main() {
66
cli.Execute()

‎hack/docs/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
},
99
"repository": {
1010
"type": "git",
11-
"url": "git+https://github.com/replicatedcom/ship.git"
11+
"url": "git+https://github.com/replicatedhq/ship.git"
1212
},
1313
"keywords": [
1414
"lol"
1515
],
1616
"author": "replicated",
1717
"license": "UNLICENSED",
1818
"bugs": {
19-
"url": "https://github.com/replicatedcom/ship/issues"
19+
"url": "https://github.com/replicatedhq/ship/issues"
2020
},
21-
"homepage": "https://github.com/replicatedcom/ship#readme",
21+
"homepage": "https://github.com/replicatedhq/ship#readme",
2222
"dependencies": {
2323
"chalk": "^2.3.0",
2424
"js-yaml": "^3.10.0",

‎pkg/cli/devtool_releaser/cmd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"github.com/mitchellh/cli"
1111
"github.com/pkg/errors"
12-
"github.com/replicatedcom/ship/pkg/logger"
12+
"github.com/replicatedhq/ship/pkg/logger"
1313
"github.com/spf13/cobra"
1414
"github.com/spf13/viper"
1515
)

‎pkg/cli/devtool_releaser/releaser.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/go-kit/kit/log"
1212
"github.com/mitchellh/cli"
1313
"github.com/pkg/errors"
14-
"github.com/replicatedcom/ship/pkg/e2e"
14+
"github.com/replicatedhq/ship/pkg/e2e"
1515
"github.com/spf13/viper"
1616
)
1717

‎pkg/cli/root.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88

99
"context"
1010

11-
"github.com/replicatedcom/ship/pkg/cli/devtool_releaser"
12-
"github.com/replicatedcom/ship/pkg/e2e"
13-
"github.com/replicatedcom/ship/pkg/ship"
14-
"github.com/replicatedcom/ship/pkg/version"
11+
"github.com/replicatedhq/ship/pkg/cli/devtool_releaser"
12+
"github.com/replicatedhq/ship/pkg/e2e"
13+
"github.com/replicatedhq/ship/pkg/ship"
14+
"github.com/replicatedhq/ship/pkg/version"
1515
"github.com/spf13/cobra"
1616
"github.com/spf13/viper"
1717
)

‎pkg/e2e/case.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111

1212
"context"
1313

14-
"github.com/replicatedcom/ship/pkg/api"
15-
"github.com/replicatedcom/ship/pkg/ship"
14+
"github.com/replicatedhq/ship/pkg/api"
15+
"github.com/replicatedhq/ship/pkg/ship"
1616
"github.com/stretchr/testify/require"
1717
)
1818

‎pkg/lifecycle/message/api.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"github.com/go-kit/kit/log/level"
1010
"github.com/mitchellh/cli"
1111
"github.com/pkg/errors"
12-
"github.com/replicatedcom/ship/pkg/api"
13-
"github.com/replicatedcom/ship/pkg/lifecycle/render/config"
14-
"github.com/replicatedcom/ship/pkg/templates"
12+
"github.com/replicatedhq/ship/pkg/api"
13+
"github.com/replicatedhq/ship/pkg/lifecycle/render/config"
14+
"github.com/replicatedhq/ship/pkg/templates"
1515
"github.com/spf13/viper"
1616
"go.uber.org/dig"
1717
)

‎pkg/lifecycle/message/cli.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"github.com/go-kit/kit/log"
99
"github.com/go-kit/kit/log/level"
1010
"github.com/mitchellh/cli"
11-
"github.com/replicatedcom/ship/pkg/api"
12-
"github.com/replicatedcom/ship/pkg/lifecycle/render/config"
13-
"github.com/replicatedcom/ship/pkg/templates"
11+
"github.com/replicatedhq/ship/pkg/api"
12+
"github.com/replicatedhq/ship/pkg/lifecycle/render/config"
13+
"github.com/replicatedhq/ship/pkg/templates"
1414
"github.com/spf13/viper"
1515
"go.uber.org/dig"
1616
)

‎pkg/lifecycle/message/messenger.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package message
33
import (
44
"context"
55

6-
"github.com/replicatedcom/ship/pkg/api"
7-
"github.com/replicatedcom/ship/pkg/lifecycle/render/config"
8-
"github.com/replicatedcom/ship/pkg/templates"
6+
"github.com/replicatedhq/ship/pkg/api"
7+
"github.com/replicatedhq/ship/pkg/lifecycle/render/config"
8+
"github.com/replicatedhq/ship/pkg/templates"
99
"github.com/spf13/viper"
1010
)
1111

‎pkg/lifecycle/message/templates.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/go-kit/kit/log/level"
88
"github.com/spf13/viper"
99

10-
"github.com/replicatedcom/ship/pkg/lifecycle/render/config"
10+
"github.com/replicatedhq/ship/pkg/lifecycle/render/config"
1111
)
1212

1313
type builderContext struct {

‎pkg/lifecycle/render/config/api.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"fmt"
88
"strconv"
99

10-
"github.com/replicatedcom/ship/pkg/api"
11-
"github.com/replicatedcom/ship/pkg/templates"
10+
"github.com/replicatedhq/ship/pkg/api"
11+
"github.com/replicatedhq/ship/pkg/templates"
1212

1313
"github.com/replicatedhq/libyaml"
1414

‎pkg/lifecycle/render/config/api_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import (
1111
"strings"
1212

1313
"github.com/go-test/deep"
14-
"github.com/replicatedcom/ship/pkg/api"
15-
_ "github.com/replicatedcom/ship/pkg/lifecycle/render/config/test-cases/api"
16-
"github.com/replicatedcom/ship/pkg/templates"
17-
"github.com/replicatedcom/ship/pkg/test-mocks/logger"
1814
"github.com/replicatedhq/libyaml"
15+
"github.com/replicatedhq/ship/pkg/api"
16+
_ "github.com/replicatedhq/ship/pkg/lifecycle/render/config/test-cases/api"
17+
"github.com/replicatedhq/ship/pkg/templates"
18+
"github.com/replicatedhq/ship/pkg/test-mocks/logger"
1919
"github.com/spf13/viper"
2020
"github.com/stretchr/testify/assert"
2121
"github.com/stretchr/testify/require"

‎pkg/lifecycle/render/config/daemon.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"sync"
88
"time"
99

10-
"github.com/replicatedcom/ship/pkg/api"
11-
"github.com/replicatedcom/ship/pkg/lifecycle/render/state"
10+
"github.com/replicatedhq/ship/pkg/api"
11+
"github.com/replicatedhq/ship/pkg/lifecycle/render/state"
1212

1313
"github.com/replicatedhq/libyaml"
1414

@@ -18,7 +18,7 @@ import (
1818
"github.com/go-kit/kit/log/level"
1919
"github.com/mitchellh/cli"
2020
"github.com/pkg/errors"
21-
"github.com/replicatedcom/ship/pkg/version"
21+
"github.com/replicatedhq/ship/pkg/version"
2222
"github.com/spf13/afero"
2323
"github.com/spf13/viper"
2424
)

‎pkg/lifecycle/render/config/daemon_channel_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515

1616
"github.com/gin-gonic/gin"
1717
"github.com/mitchellh/cli"
18-
"github.com/replicatedcom/ship/pkg/api"
19-
"github.com/replicatedcom/ship/pkg/test-mocks/logger"
18+
"github.com/replicatedhq/ship/pkg/api"
19+
"github.com/replicatedhq/ship/pkg/test-mocks/logger"
2020
"github.com/spf13/afero"
2121
"github.com/spf13/viper"
2222
"github.com/stretchr/testify/require"

‎pkg/lifecycle/render/config/daemon_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313
"math/rand"
1414

1515
"github.com/mitchellh/cli"
16-
"github.com/replicatedcom/ship/pkg/api"
17-
"github.com/replicatedcom/ship/pkg/test-mocks/logger"
1816
"github.com/replicatedhq/libyaml"
17+
"github.com/replicatedhq/ship/pkg/api"
18+
"github.com/replicatedhq/ship/pkg/test-mocks/logger"
1919
"github.com/spf13/afero"
2020
"github.com/spf13/viper"
2121
"github.com/stretchr/testify/require"

‎pkg/lifecycle/render/config/daemonresolver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"errors"
66
"time"
77

8-
"github.com/replicatedcom/ship/pkg/api"
8+
"github.com/replicatedhq/ship/pkg/api"
99

1010
"github.com/go-kit/kit/log"
1111
"github.com/go-kit/kit/log/level"

‎pkg/lifecycle/render/config/daemonresolver_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"time"
77

88
"github.com/mitchellh/cli"
9-
"github.com/replicatedcom/ship/pkg/api"
10-
"github.com/replicatedcom/ship/pkg/test-mocks/logger"
119
"github.com/replicatedhq/libyaml"
10+
"github.com/replicatedhq/ship/pkg/api"
11+
"github.com/replicatedhq/ship/pkg/test-mocks/logger"
1212
"github.com/spf13/afero"
1313
"github.com/spf13/viper"
1414
"github.com/stretchr/testify/require"

‎pkg/lifecycle/render/config/dep_graph.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/replicatedhq/libyaml"
1010

11-
"github.com/replicatedcom/ship/pkg/templates"
11+
"github.com/replicatedhq/ship/pkg/templates"
1212

1313
"github.com/pkg/errors"
1414
)

0 commit comments

Comments
 (0)