diff options
38 files changed, 62 insertions, 111 deletions
diff --git a/.arcconfig b/.arcconfig deleted file mode 100644 index d38aa5e..0000000 --- a/.arcconfig +++ /dev/null @@ -1,8 +0,0 @@ -{ - "phabricator.uri" : "https://phabricator.wikimedia.org/", - "repository.callsign" : "GBLBR", - "unit.engine": "GoTestEngine", - "load" : [ - ".arcvendor/arcanist-go" - ] -} diff --git a/.arclint b/.arclint deleted file mode 100644 index c413c3c..0000000 --- a/.arclint +++ /dev/null @@ -1,18 +0,0 @@ -{ - "exclude": "(^vendor/)", - "linters": { - "golint": { - "type": "golint", - "include": "(\\.go$)" - }, - "govet": { - "type": "govet", - "flags": ["-composites=false"], - "include": "(\\.go$)" - }, - "gofmt": { - "type": "gofmt", - "include": "(\\.go$)" - } - } -} diff --git a/.arcvendor/arcanist-go b/.arcvendor/arcanist-go deleted file mode 160000 -Subproject b669eaa4075690ce58cc9c79aa830db8bb3ccbb diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 6d8c79f..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "vendor/arcanist-go"] - path = .arcvendor/arcanist-go - url = https://github.com/kalbasit/arcanist-go.git diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 55e7174..57d01c2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,13 +19,10 @@ to both users inside and outside of WMF and our communities. 2. `dep` for dependency management * On macOS, try Homebrew: `brew install dep` * [Other](https://golang.github.io/dep/docs/installation.html) - 3. `arcanist` for code review - * See our [help article](https://www.mediawiki.org/wiki/Phabricator/Arcanist) - for setup instructions. - 4. An account at [phabricator.wikimedia.org](https://phabricator.wikimedia.org) - * See our [help article](https://www.mediawiki.org/wiki/Phabricator/Help) - for setup instructions. - 5. (optional) `gox` is used for cross-compiling binary releases. To + 3. An account at [gerrit.wikimedia.org](https://gerrit.wikimedia.org) + * See the [guide](https://www.mediawiki.org/wiki/Gerrit/Getting_started) + on mediawiki.org for setup instructions. + 4. (optional) `gox` is used for cross-compiling binary releases. To install `gox` use `go get github.com/mitchellh/gox`. ## Get the source @@ -33,28 +30,21 @@ to both users inside and outside of WMF and our communities. Use `go get` to install the source from our Git repo into `src` under your `GOPATH`. By default, this will be `~/go/src`. - go get phabricator.wikimedia.org/source/blubber + go get gerrit.wikimedia.org/r/blubber Symlink it to a different directory if you'd prefer not to work from your `GOPATH`. For example: cd ~/Projects - ln -s ~/go/src/phabricator.wikimedia.org/source/blubber + ln -s ~/go/src/gerrit.wikimedia.org/r/blubber cd blubber # yay. -## Initialize submodules in `.arcvendor` - -We currently use a submodule for integrating Go testing tools into Arcanist -which will run automatically upon submission to Differential via `arc diff`. - - git submodule update --init - ## Have a read through the documentation If you haven't already seen the [README.md](README.md), check it out. Run `godoc -http :9999` and peruse the HTML generated from inline docs -at `localhost:9999/pkg/phabricator.wikimedia.org/source/blubber`. +at `localhost:9999/pkg/gerrit.wikimedia.org/r/blubber`. ## Installing or updating dependencies @@ -70,30 +60,20 @@ If you do update `Gopkg.toml` to add, update, or remove a dependency, simply run `dep ensure && dep prune` after doing so, and commit the resulting `vendor` directory changes. - ## Running tests Tests and linters for packages/files you've changed will automatically run -when you submit your changes to Differential via `arc diff`. You can also do -this manually. +when you submit your changes to Gerrit for review. You can also run tests +locally by running `go test`. - arc unit # or - arc unit --everything # or simply - go test ./... # or + go test ./... # for everything, or go test -run TestFuncName ./... # to run a single test - arc lint # or - arc lint --everything - -## Getting your changes reviewed - -Use `arc diff` to submit your changes to Differential. - - -## Landing your changes +## Getting your changes reviewed and merged -Once your changes have been accepted, run `arc land` on your local branch to -merge/push the commit and close the diff. +Push your changes to Gerrit for review. See the +[guide](https://www.mediawiki.org/wiki/Gerrit/Tutorial#How_to_submit_a_patch) +on mediawiki.org on how to correctly prepare and submit a patch. ## Releases @@ -1,7 +1,7 @@ RELEASE_DIR ?= ./_release TARGETS ?= darwin/amd64 linux/amd64 linux/386 linux/arm linux/arm64 linux/ppc64le windows/amd64 plan9/amd64 -PACKAGE := phabricator.wikimedia.org/source/blubber +PACKAGE := gerrit.wikimedia.org/r/blubber REAL_CURDIR := $(shell readlink "$(CURDIR)" || echo "$(CURDIR)") GO_LDFLAGS := \ diff --git a/build/instructions_test.go b/build/instructions_test.go index 561bf80..7cc2b20 100644 --- a/build/instructions_test.go +++ b/build/instructions_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "phabricator.wikimedia.org/source/blubber/build" + "gerrit.wikimedia.org/r/blubber/build" ) func TestRun(t *testing.T) { diff --git a/build/macros_test.go b/build/macros_test.go index c5066a6..7b656b1 100644 --- a/build/macros_test.go +++ b/build/macros_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "phabricator.wikimedia.org/source/blubber/build" + "gerrit.wikimedia.org/r/blubber/build" ) func TestApplyUser(t *testing.T) { diff --git a/config/apt.go b/config/apt.go index bafc06a..34a0d4a 100644 --- a/config/apt.go +++ b/config/apt.go @@ -1,7 +1,7 @@ package config import ( - "phabricator.wikimedia.org/source/blubber/build" + "gerrit.wikimedia.org/r/blubber/build" ) // AptConfig represents configuration pertaining to package installation from diff --git a/config/apt_test.go b/config/apt_test.go index f8f0a44..ae4fce2 100644 --- a/config/apt_test.go +++ b/config/apt_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" - "phabricator.wikimedia.org/source/blubber/build" - "phabricator.wikimedia.org/source/blubber/config" + "gerrit.wikimedia.org/r/blubber/build" + "gerrit.wikimedia.org/r/blubber/config" ) func TestAptConfigYAML(t *testing.T) { diff --git a/config/artifacts.go b/config/artifacts.go index 9f23e42..982f8ab 100644 --- a/config/artifacts.go +++ b/config/artifacts.go @@ -1,7 +1,7 @@ package config import ( - "phabricator.wikimedia.org/source/blubber/build" + "gerrit.wikimedia.org/r/blubber/build" ) // ArtifactsConfig declares files and directories to be copied from one diff --git a/config/artifacts_test.go b/config/artifacts_test.go index 3574020..49927db 100644 --- a/config/artifacts_test.go +++ b/config/artifacts_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" - "phabricator.wikimedia.org/source/blubber/build" - "phabricator.wikimedia.org/source/blubber/config" + "gerrit.wikimedia.org/r/blubber/build" + "gerrit.wikimedia.org/r/blubber/config" ) func TestArtifactsConfigYAML(t *testing.T) { diff --git a/config/builder.go b/config/builder.go index 112f181..98c560c 100644 --- a/config/builder.go +++ b/config/builder.go @@ -1,7 +1,7 @@ package config import ( - "phabricator.wikimedia.org/source/blubber/build" + "gerrit.wikimedia.org/r/blubber/build" ) // BuilderConfig contains configuration for the definition of an arbitrary diff --git a/config/builder_test.go b/config/builder_test.go index 42b5e09..a35221e 100644 --- a/config/builder_test.go +++ b/config/builder_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" - "phabricator.wikimedia.org/source/blubber/build" - "phabricator.wikimedia.org/source/blubber/config" + "gerrit.wikimedia.org/r/blubber/build" + "gerrit.wikimedia.org/r/blubber/config" ) func TestBuilderConfigYAML(t *testing.T) { diff --git a/config/common.go b/config/common.go index 96fb2b0..b3a9401 100644 --- a/config/common.go +++ b/config/common.go @@ -1,7 +1,7 @@ package config import ( - "phabricator.wikimedia.org/source/blubber/build" + "gerrit.wikimedia.org/r/blubber/build" ) // CommonConfig holds the configuration fields common to both the root config diff --git a/config/common_test.go b/config/common_test.go index 0b3fd9b..3674d64 100644 --- a/config/common_test.go +++ b/config/common_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "phabricator.wikimedia.org/source/blubber/config" + "gerrit.wikimedia.org/r/blubber/config" ) func TestCommonConfigYAML(t *testing.T) { diff --git a/config/config_test.go b/config/config_test.go index 78dee30..5f694ee 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "phabricator.wikimedia.org/source/blubber/config" + "gerrit.wikimedia.org/r/blubber/config" ) func TestConfigYAML(t *testing.T) { diff --git a/config/flag_test.go b/config/flag_test.go index 0f6bcdf..fb3ac12 100644 --- a/config/flag_test.go +++ b/config/flag_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "phabricator.wikimedia.org/source/blubber/config" + "gerrit.wikimedia.org/r/blubber/config" ) func TestFlagMerge(t *testing.T) { diff --git a/config/lives.go b/config/lives.go index 665a734..0e45247 100644 --- a/config/lives.go +++ b/config/lives.go @@ -1,7 +1,7 @@ package config import ( - "phabricator.wikimedia.org/source/blubber/build" + "gerrit.wikimedia.org/r/blubber/build" ) // LocalLibPrefix declares the shared directory into which application level diff --git a/config/lives_test.go b/config/lives_test.go index 32916e5..d740586 100644 --- a/config/lives_test.go +++ b/config/lives_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" - "phabricator.wikimedia.org/source/blubber/build" - "phabricator.wikimedia.org/source/blubber/config" + "gerrit.wikimedia.org/r/blubber/build" + "gerrit.wikimedia.org/r/blubber/config" ) func TestLivesConfigYAML(t *testing.T) { diff --git a/config/node.go b/config/node.go index 5834443..9256fce 100644 --- a/config/node.go +++ b/config/node.go @@ -2,7 +2,7 @@ package config import ( "path" - "phabricator.wikimedia.org/source/blubber/build" + "gerrit.wikimedia.org/r/blubber/build" ) // NodeConfig holds configuration fields related to the Node environment and diff --git a/config/node_test.go b/config/node_test.go index 822da77..6f9e3f4 100644 --- a/config/node_test.go +++ b/config/node_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" - "phabricator.wikimedia.org/source/blubber/build" - "phabricator.wikimedia.org/source/blubber/config" + "gerrit.wikimedia.org/r/blubber/build" + "gerrit.wikimedia.org/r/blubber/config" ) func TestNodeConfigYAML(t *testing.T) { diff --git a/config/policy_test.go b/config/policy_test.go index 80de387..09d838c 100644 --- a/config/policy_test.go +++ b/config/policy_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "phabricator.wikimedia.org/source/blubber/config" + "gerrit.wikimedia.org/r/blubber/config" ) func TestPolicyRead(t *testing.T) { diff --git a/config/python.go b/config/python.go index f63ce25..50bfa99 100644 --- a/config/python.go +++ b/config/python.go @@ -4,7 +4,7 @@ import ( "path" "sort" - "phabricator.wikimedia.org/source/blubber/build" + "gerrit.wikimedia.org/r/blubber/build" ) // PythonLibPrefix is the path to installed dependency wheels. diff --git a/config/python_test.go b/config/python_test.go index 004d2d1..3eb6e72 100644 --- a/config/python_test.go +++ b/config/python_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" - "phabricator.wikimedia.org/source/blubber/build" - "phabricator.wikimedia.org/source/blubber/config" + "gerrit.wikimedia.org/r/blubber/build" + "gerrit.wikimedia.org/r/blubber/config" ) func TestPythonConfigYAMLMerge(t *testing.T) { diff --git a/config/reader_test.go b/config/reader_test.go index cb187ef..172bf20 100644 --- a/config/reader_test.go +++ b/config/reader_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "phabricator.wikimedia.org/source/blubber/config" + "gerrit.wikimedia.org/r/blubber/config" ) func ExampleResolveIncludes() { diff --git a/config/runs.go b/config/runs.go index 361ac78..9657303 100644 --- a/config/runs.go +++ b/config/runs.go @@ -1,7 +1,7 @@ package config import ( - "phabricator.wikimedia.org/source/blubber/build" + "gerrit.wikimedia.org/r/blubber/build" ) // RunsConfig holds configuration fields related to the application's diff --git a/config/runs_test.go b/config/runs_test.go index 18ffeeb..0f2266d 100644 --- a/config/runs_test.go +++ b/config/runs_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" - "phabricator.wikimedia.org/source/blubber/build" - "phabricator.wikimedia.org/source/blubber/config" + "gerrit.wikimedia.org/r/blubber/build" + "gerrit.wikimedia.org/r/blubber/config" ) func TestRunsConfigYAML(t *testing.T) { diff --git a/config/user_test.go b/config/user_test.go index bb19296..f908f88 100644 --- a/config/user_test.go +++ b/config/user_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "phabricator.wikimedia.org/source/blubber/config" + "gerrit.wikimedia.org/r/blubber/config" ) func TestUserConfigValidation(t *testing.T) { diff --git a/config/validation_test.go b/config/validation_test.go index 0af68cf..199c013 100644 --- a/config/validation_test.go +++ b/config/validation_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "gopkg.in/go-playground/validator.v9" - "phabricator.wikimedia.org/source/blubber/config" + "gerrit.wikimedia.org/r/blubber/config" ) func TestIsValidationError(t *testing.T) { diff --git a/config/variant.go b/config/variant.go index 3737e22..7886cfe 100644 --- a/config/variant.go +++ b/config/variant.go @@ -1,7 +1,7 @@ package config import ( - "phabricator.wikimedia.org/source/blubber/build" + "gerrit.wikimedia.org/r/blubber/build" ) // VariantConfig holds configuration fields for each defined build variant. diff --git a/config/variant_test.go b/config/variant_test.go index a99f2f5..0479c08 100644 --- a/config/variant_test.go +++ b/config/variant_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" - "phabricator.wikimedia.org/source/blubber/build" - "phabricator.wikimedia.org/source/blubber/config" + "gerrit.wikimedia.org/r/blubber/build" + "gerrit.wikimedia.org/r/blubber/config" ) func TestVariantConfigYAML(t *testing.T) { diff --git a/config/version_test.go b/config/version_test.go index 0b676c8..ac9f5b7 100644 --- a/config/version_test.go +++ b/config/version_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "phabricator.wikimedia.org/source/blubber/config" + "gerrit.wikimedia.org/r/blubber/config" ) func TestVersionConfigYAML(t *testing.T) { diff --git a/docker/compiler.go b/docker/compiler.go index b0d5dce..4d60a22 100644 --- a/docker/compiler.go +++ b/docker/compiler.go @@ -6,9 +6,9 @@ package docker import ( "bytes" - "phabricator.wikimedia.org/source/blubber/build" - "phabricator.wikimedia.org/source/blubber/config" - "phabricator.wikimedia.org/source/blubber/meta" + "gerrit.wikimedia.org/r/blubber/build" + "gerrit.wikimedia.org/r/blubber/config" + "gerrit.wikimedia.org/r/blubber/meta" ) // Compile takes a parsed config.Config and a configured variant name and diff --git a/docker/compiler_test.go b/docker/compiler_test.go index 0c495af..d8ab18f 100644 --- a/docker/compiler_test.go +++ b/docker/compiler_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/assert" - "phabricator.wikimedia.org/source/blubber/config" - "phabricator.wikimedia.org/source/blubber/docker" - "phabricator.wikimedia.org/source/blubber/meta" + "gerrit.wikimedia.org/r/blubber/config" + "gerrit.wikimedia.org/r/blubber/docker" + "gerrit.wikimedia.org/r/blubber/meta" ) func TestSingleStageHasNoName(t *testing.T) { diff --git a/docker/instructions.go b/docker/instructions.go index 56c04b9..8f5c63c 100644 --- a/docker/instructions.go +++ b/docker/instructions.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "phabricator.wikimedia.org/source/blubber/build" + "gerrit.wikimedia.org/r/blubber/build" ) // NewInstruction takes a general internal build.Instruction and returns diff --git a/docker/instructions_test.go b/docker/instructions_test.go index 9bdbeb1..b89a721 100644 --- a/docker/instructions_test.go +++ b/docker/instructions_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" - "phabricator.wikimedia.org/source/blubber/build" - "phabricator.wikimedia.org/source/blubber/docker" + "gerrit.wikimedia.org/r/blubber/build" + "gerrit.wikimedia.org/r/blubber/docker" ) func TestRun(t *testing.T) { @@ -9,9 +9,9 @@ import ( "github.com/pborman/getopt/v2" - "phabricator.wikimedia.org/source/blubber/config" - "phabricator.wikimedia.org/source/blubber/docker" - "phabricator.wikimedia.org/source/blubber/meta" + "gerrit.wikimedia.org/r/blubber/config" + "gerrit.wikimedia.org/r/blubber/docker" + "gerrit.wikimedia.org/r/blubber/meta" ) const parameters = "config.yaml variant" |