Skip to content

Commit

Permalink
Replacing all references of qbarrand with rh-ecosystem-edge.
Browse files Browse the repository at this point in the history 
The project was migrated from `github.com/qbarrand/gitstream` to
`github.com/rh-ecosystem-edge/gitstream`, therefore, all import path
were needed to be updated.

Also building the new `ghcr.io/rh-ecosystem-edge/gitstream` image.

Signed-off-by: Yoni Bettan <[email protected]>
  • Loading branch information
@ybettan
ybettan committed Aug 14, 2024
1 parent 369aeee commit 1ddf283
Show file tree
Hide file tree
Showing 29 changed files with 74 additions and 74 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/container-image.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
id: meta
uses: docker/metadata-action@v5
with:
images: ghcr.io/qbarrand/gitstream
images: ghcr.io/rh-ecosystem-edge/gitstream
tags: |
type=ref,event=branch
type=semver,pattern={{version}}
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# gitstream
Sync two repositories by cherry-picking upstream commits into downstream

[![Go Reference](https://pkg.go.dev/badge/github.com/qbarrand/gitstream.svg)](https://pkg.go.dev/github.com/qbarrand/gitstream)
[![codecov](https://codecov.io/gh/qbarrand/gitstream/branch/main/graph/badge.svg?token=T1QT6I9VNZ)](https://codecov.io/gh/qbarrand/gitstream)
[![Go Report Card](https://goreportcard.com/badge/github.com/qbarrand/gitstream)](https://goreportcard.com/report/github.com/qbarrand/gitstream)
[![Go Reference](https://pkg.go.dev/badge/github.com/rh-ecosystem-edge/gitstream.svg)](https://pkg.go.dev/github.com/rh-ecosystem-edge/gitstream)
[![codecov](https://codecov.io/gh/rh-ecosystem-edge/gitstream/branch/main/graph/badge.svg?token=T1QT6I9VNZ)](https://codecov.io/gh/rh-ecosystem-edge/gitstream)
[![Go Report Card](https://goreportcard.com/badge/github.com/rh-ecosystem-edge/gitstream)](https://goreportcard.com/report/github.com/rh-ecosystem-edge/gitstream)
14 changes: 7 additions & 7 deletions cmd/cli/root.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ import (
"github.com/go-git/go-git/v5"
"github.com/go-logr/logr"
"github.com/go-logr/stdr"
"github.com/qbarrand/gitstream/internal/config"
gh "github.com/qbarrand/gitstream/internal/github"
"github.com/qbarrand/gitstream/internal/gitstream"
"github.com/qbarrand/gitstream/internal/gitutils"
"github.com/qbarrand/gitstream/internal/intents"
"github.com/qbarrand/gitstream/internal/markup"
"github.com/qbarrand/gitstream/internal/owners"
"github.com/rh-ecosystem-edge/gitstream/internal/config"
gh "github.com/rh-ecosystem-edge/gitstream/internal/github"
"github.com/rh-ecosystem-edge/gitstream/internal/gitstream"
"github.com/rh-ecosystem-edge/gitstream/internal/gitutils"
"github.com/rh-ecosystem-edge/gitstream/internal/intents"
"github.com/rh-ecosystem-edge/gitstream/internal/markup"
"github.com/rh-ecosystem-edge/gitstream/internal/owners"
"github.com/urfave/cli/v2"
)

Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/qbarrand/gitstream
module github.com/rh-ecosystem-edge/gitstream

go 1.21

Expand Down
2 changes: 1 addition & 1 deletion internal/github/data.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package github
import (
"errors"

"github.com/qbarrand/gitstream/internal/process"
"github.com/rh-ecosystem-edge/gitstream/internal/process"
)

type Commit struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/github/issue.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/go-git/go-git/v5/plumbing/object"
"github.com/google/go-github/v47/github"
"github.com/qbarrand/gitstream/internal"
"github.com/rh-ecosystem-edge/gitstream/internal"
)

//go:generate mockgen -source=issue.go -package=github -destination=mock_issue.go
Expand Down
4 changes: 2 additions & 2 deletions internal/github/issue_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/go-git/go-git/v5/plumbing/object"
"github.com/google/go-github/v47/github"
"github.com/migueleliasweb/go-github-mock/src/mock"
gh "github.com/qbarrand/gitstream/internal/github"
"github.com/qbarrand/gitstream/internal/process"
gh "github.com/rh-ecosystem-edge/gitstream/internal/github"
"github.com/rh-ecosystem-edge/gitstream/internal/process"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/github/pr.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/cli/go-gh/pkg/api"
"github.com/go-git/go-git/v5/plumbing/object"
"github.com/google/go-github/v47/github"
"github.com/qbarrand/gitstream/internal"
"github.com/rh-ecosystem-edge/gitstream/internal"
"github.com/shurcooL/githubv4"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/github/pr_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/go-git/go-git/v5/plumbing/object"
"github.com/google/go-github/v47/github"
"github.com/migueleliasweb/go-github-mock/src/mock"
gh "github.com/qbarrand/gitstream/internal/github"
gh "github.com/rh-ecosystem-edge/gitstream/internal/github"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/github/templates/issue.tmpl
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- /*gotype: github.com/qbarrand/gitstream/internal/github.IssueData*/ -}}
{{- /*gotype: github.com/rh-ecosystem-edge/gitstream/internal/github.IssueData*/ -}}
{{ .AppName }} tried to cherry-pick commit `{{ .Commit.SHA }}` from `{{ .UpstreamURL }}` but was unable to do so.

Commit message:
Expand Down
2 changes: 1 addition & 1 deletion internal/github/templates/pr.tmpl
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- /*gotype: github.com/qbarrand/gitstream/internal/github.PRData*/ -}}
{{- /*gotype: github.com/rh-ecosystem-edge/gitstream/internal/github.PRData*/ -}}
This is an automated cherry-pick by {{ .AppName }} of `{{ .Commit.SHA }}` from `{{ .UpstreamURL }}`.

Commit message:
Expand Down
2 changes: 1 addition & 1 deletion internal/github/user_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"github.com/google/go-github/v47/github"
"github.com/migueleliasweb/go-github-mock/src/mock"
gh "github.com/qbarrand/gitstream/internal/github"
gh "github.com/rh-ecosystem-edge/gitstream/internal/github"
"github.com/stretchr/testify/assert"
)

Expand Down
12 changes: 6 additions & 6 deletions internal/gitstream/assign.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (
"github.com/go-logr/logr"
"github.com/google/go-github/v47/github"
"github.com/hashicorp/go-multierror"
"github.com/qbarrand/gitstream/internal"
"github.com/qbarrand/gitstream/internal/config"
gh "github.com/qbarrand/gitstream/internal/github"
"github.com/qbarrand/gitstream/internal/gitutils"
"github.com/qbarrand/gitstream/internal/markup"
"github.com/qbarrand/gitstream/internal/owners"
"github.com/rh-ecosystem-edge/gitstream/internal"
"github.com/rh-ecosystem-edge/gitstream/internal/config"
gh "github.com/rh-ecosystem-edge/gitstream/internal/github"
"github.com/rh-ecosystem-edge/gitstream/internal/gitutils"
"github.com/rh-ecosystem-edge/gitstream/internal/markup"
"github.com/rh-ecosystem-edge/gitstream/internal/owners"
)

type Assign struct {
Expand Down
12 changes: 6 additions & 6 deletions internal/gitstream/assign_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (
"github.com/go-logr/logr"
"github.com/golang/mock/gomock"
"github.com/google/go-github/v47/github"
"github.com/qbarrand/gitstream/internal/config"
gh "github.com/qbarrand/gitstream/internal/github"
"github.com/qbarrand/gitstream/internal/gitutils"
"github.com/qbarrand/gitstream/internal/markup"
"github.com/qbarrand/gitstream/internal/owners"
"github.com/qbarrand/gitstream/internal/test"
"github.com/rh-ecosystem-edge/gitstream/internal/config"
gh "github.com/rh-ecosystem-edge/gitstream/internal/github"
"github.com/rh-ecosystem-edge/gitstream/internal/gitutils"
"github.com/rh-ecosystem-edge/gitstream/internal/markup"
"github.com/rh-ecosystem-edge/gitstream/internal/owners"
"github.com/rh-ecosystem-edge/gitstream/internal/test"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/gitstream/branches.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/go-git/go-git/v5"
"github.com/go-git/go-git/v5/config"
"github.com/go-logr/logr"
"github.com/qbarrand/gitstream/internal"
"github.com/qbarrand/gitstream/internal/gitutils"
"github.com/rh-ecosystem-edge/gitstream/internal"
"github.com/rh-ecosystem-edge/gitstream/internal/gitutils"
)

type DeleteRemoteBranches struct {
Expand Down
6 changes: 3 additions & 3 deletions internal/gitstream/diff.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (

"github.com/go-git/go-git/v5"
"github.com/go-logr/logr"
"github.com/qbarrand/gitstream/internal/config"
gh "github.com/qbarrand/gitstream/internal/github"
"github.com/qbarrand/gitstream/internal/gitutils"
"github.com/rh-ecosystem-edge/gitstream/internal/config"
gh "github.com/rh-ecosystem-edge/gitstream/internal/github"
"github.com/rh-ecosystem-edge/gitstream/internal/gitutils"
)

type Diff struct {
Expand Down
10 changes: 5 additions & 5 deletions internal/gitstream/sync.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"github.com/go-git/go-git/v5/plumbing"
"github.com/go-git/go-git/v5/plumbing/object"
"github.com/go-logr/logr"
"github.com/qbarrand/gitstream/internal"
"github.com/qbarrand/gitstream/internal/config"
gh "github.com/qbarrand/gitstream/internal/github"
"github.com/qbarrand/gitstream/internal/gitutils"
"github.com/qbarrand/gitstream/internal/process"
"github.com/rh-ecosystem-edge/gitstream/internal"
"github.com/rh-ecosystem-edge/gitstream/internal/config"
gh "github.com/rh-ecosystem-edge/gitstream/internal/github"
"github.com/rh-ecosystem-edge/gitstream/internal/gitutils"
"github.com/rh-ecosystem-edge/gitstream/internal/process"
)

type Sync struct {
Expand Down
8 changes: 4 additions & 4 deletions internal/gitstream/sync_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import (
"github.com/go-logr/logr"
"github.com/golang/mock/gomock"
"github.com/google/go-github/v47/github"
"github.com/qbarrand/gitstream/internal/config"
gh "github.com/qbarrand/gitstream/internal/github"
"github.com/qbarrand/gitstream/internal/gitutils"
"github.com/qbarrand/gitstream/internal/test"
"github.com/rh-ecosystem-edge/gitstream/internal/config"
gh "github.com/rh-ecosystem-edge/gitstream/internal/github"
"github.com/rh-ecosystem-edge/gitstream/internal/gitutils"
"github.com/rh-ecosystem-edge/gitstream/internal/test"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
10 changes: 5 additions & 5 deletions internal/gitstream/undraft.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"github.com/go-git/go-git/v5"
"github.com/go-logr/logr"
"github.com/google/go-github/v47/github"
"github.com/qbarrand/gitstream/internal"
"github.com/qbarrand/gitstream/internal/config"
gh "github.com/qbarrand/gitstream/internal/github"
"github.com/qbarrand/gitstream/internal/gitutils"
"github.com/qbarrand/gitstream/internal/markup"
"github.com/rh-ecosystem-edge/gitstream/internal"
"github.com/rh-ecosystem-edge/gitstream/internal/config"
gh "github.com/rh-ecosystem-edge/gitstream/internal/github"
"github.com/rh-ecosystem-edge/gitstream/internal/gitutils"
"github.com/rh-ecosystem-edge/gitstream/internal/markup"
)

type Undraft struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/gitutils/cherrypick.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/go-git/go-git/v5"
"github.com/go-git/go-git/v5/plumbing/object"
"github.com/go-logr/logr"
"github.com/qbarrand/gitstream/internal/process"
"github.com/rh-ecosystem-edge/gitstream/internal/process"
)

//go:generate mockgen -source=cherrypick.go -package=gitutils -destination=mock_cherrypick.go
Expand Down
4 changes: 2 additions & 2 deletions internal/gitutils/cherrypick_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/go-git/go-git/v5/plumbing/object"
"github.com/go-logr/logr"
"github.com/golang/mock/gomock"
"github.com/qbarrand/gitstream/internal/process"
"github.com/qbarrand/gitstream/internal/test"
"github.com/rh-ecosystem-edge/gitstream/internal/process"
"github.com/rh-ecosystem-edge/gitstream/internal/test"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
8 changes: 4 additions & 4 deletions internal/gitutils/differ.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"github.com/go-git/go-git/v5"
"github.com/go-git/go-git/v5/plumbing/object"
"github.com/go-logr/logr"
"github.com/qbarrand/gitstream/internal"
"github.com/qbarrand/gitstream/internal/config"
gh "github.com/qbarrand/gitstream/internal/github"
"github.com/qbarrand/gitstream/internal/intents"
"github.com/rh-ecosystem-edge/gitstream/internal"
"github.com/rh-ecosystem-edge/gitstream/internal/config"
gh "github.com/rh-ecosystem-edge/gitstream/internal/github"
"github.com/rh-ecosystem-edge/gitstream/internal/intents"
)

//go:generate mockgen -source=differ.go -package=gitutils -destination=mock_differ.go
Expand Down
8 changes: 4 additions & 4 deletions internal/gitutils/differ_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"github.com/go-git/go-git/v5/plumbing"
"github.com/go-logr/logr"
"github.com/golang/mock/gomock"
"github.com/qbarrand/gitstream/internal/config"
gh "github.com/qbarrand/gitstream/internal/github"
"github.com/qbarrand/gitstream/internal/intents"
"github.com/qbarrand/gitstream/internal/test"
"github.com/rh-ecosystem-edge/gitstream/internal/config"
gh "github.com/rh-ecosystem-edge/gitstream/internal/github"
"github.com/rh-ecosystem-edge/gitstream/internal/intents"
"github.com/rh-ecosystem-edge/gitstream/internal/test"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
4 changes: 2 additions & 2 deletions internal/gitutils/mock_differ.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions internal/intents/getter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"github.com/go-git/go-git/v5/plumbing/object"
"github.com/go-logr/logr"
"github.com/google/go-github/v47/github"
"github.com/qbarrand/gitstream/internal"
gh "github.com/qbarrand/gitstream/internal/github"
"github.com/qbarrand/gitstream/internal/markup"
"github.com/rh-ecosystem-edge/gitstream/internal"
gh "github.com/rh-ecosystem-edge/gitstream/internal/github"
"github.com/rh-ecosystem-edge/gitstream/internal/markup"
)

type CommitIntents map[plumbing.Hash]string
Expand Down
6 changes: 3 additions & 3 deletions internal/intents/getter_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"github.com/golang/mock/gomock"
"github.com/google/go-github/v47/github"
"github.com/migueleliasweb/go-github-mock/src/mock"
gh "github.com/qbarrand/gitstream/internal/github"
"github.com/qbarrand/gitstream/internal/intents"
"github.com/qbarrand/gitstream/internal/markup"
gh "github.com/rh-ecosystem-edge/gitstream/internal/github"
"github.com/rh-ecosystem-edge/gitstream/internal/intents"
"github.com/rh-ecosystem-edge/gitstream/internal/markup"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/intents/mock_getter.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/markup/finder_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"

"github.com/go-git/go-git/v5/plumbing"
"github.com/qbarrand/gitstream/internal/markup"
"github.com/rh-ecosystem-edge/gitstream/internal/markup"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"os/signal"

"github.com/go-logr/stdr"
"github.com/qbarrand/gitstream/cmd/cli"
"github.com/rh-ecosystem-edge/gitstream/cmd/cli"
)

func main() {
Expand Down

0 comments on commit 1ddf283

Please sign in to comment.