From 82ea2d47b708b22fbee13abb046ac413c6a1d22e Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Wed, 4 Jul 2018 22:26:01 +0000 Subject: [PATCH 1/3] Fetch user if no --owner is given (#17) --- Gopkg.lock | 17 +++-------------- cmd/migrate-all.go | 9 ++++++++- cmd/migrate.go | 9 ++++++++- migrations/migratory.go | 2 +- migrations/repo.go | 2 +- 5 files changed, 21 insertions(+), 18 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index bcb88be..2736379 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -5,7 +5,7 @@ branch = "master" name = "code.gitea.io/sdk" packages = ["gitea"] - revision = "39c609e903992e25deca0e7aa2c5304fd680530f" + revision = "79a281c4e34ae44cf96a23f0283729a074a6c2a0" [[projects]] name = "github.com/davecgh/go-spew" @@ -37,20 +37,9 @@ revision = "792786c7400a136282c1664665ae0a8db921c6c2" version = "v1.0.0" -[[projects]] - name = "github.com/stretchr/objx" - packages = ["."] - revision = "477a77ecc69700c7cdeb1fa9e129548e1c1c393c" - version = "v0.1.1" - [[projects]] name = "github.com/stretchr/testify" - packages = [ - ".", - "assert", - "http", - "mock" - ] + packages = ["assert"] revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686" version = "v1.2.2" @@ -95,6 +84,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "884bf618611f0aaad19defa64a14fa70fd2b522afe8cf99dedbfada2a9d8b88d" + inputs-digest = "a63a8945bd36ecc14dfbb7f9894543855f9e9e2e493dfdb77c06b4a12aada8a4" solver-name = "gps-cdcl" solver-version = 1 diff --git a/cmd/migrate-all.go b/cmd/migrate-all.go index de3d840..eb09938 100644 --- a/cmd/migrate-all.go +++ b/cmd/migrate-all.go @@ -30,7 +30,14 @@ func runMigrateAll(ctx *cli.Context) error { m := &migrations.Migratory{ Client: gitea.NewClient(ctx.String("url"), ctx.String("token")), Private: ctx.Bool("private"), - NewOwnerID: ctx.Int("owner"), + NewOwnerID: ctx.Int64("owner"), + } + if m.NewOwnerID == 0 { + usr, err := m.Client.GetMyUserInfo() + if err != nil { + return fmt.Errorf("cannot fetch user info about current user: %v", err) + } + m.NewOwnerID = usr.ID } c := context.Background() diff --git a/cmd/migrate.go b/cmd/migrate.go index 271f492..b943ca4 100644 --- a/cmd/migrate.go +++ b/cmd/migrate.go @@ -31,7 +31,14 @@ func runMigrate(ctx *cli.Context) error { m := &migrations.Migratory{ Client: gitea.NewClient(ctx.String("url"), ctx.String("token")), Private: ctx.Bool("private"), - NewOwnerID: ctx.Int("owner"), + NewOwnerID: ctx.Int64("owner"), + } + if m.NewOwnerID == 0 { + usr, err := m.Client.GetMyUserInfo() + if err != nil { + return fmt.Errorf("cannot fetch user info about current user: %v", err) + } + m.NewOwnerID = usr.ID } c := context.Background() var gc *github.Client diff --git a/migrations/migratory.go b/migrations/migratory.go index 77d9cfd..69a6921 100644 --- a/migrations/migratory.go +++ b/migrations/migratory.go @@ -9,7 +9,7 @@ type Migratory struct { AuthPassword string Private bool - NewOwnerID int + NewOwnerID int64 repository *gitea.Repository // key: github milestone id | value: gitea milestone id diff --git a/migrations/repo.go b/migrations/repo.go index 9495aef..a98b553 100644 --- a/migrations/repo.go +++ b/migrations/repo.go @@ -14,7 +14,7 @@ func (m *Migratory) Repository(gr *github.Repository) (*gitea.Repository, error) AuthUsername: m.AuthUsername, CloneAddr: gr.GetCloneURL(), RepoName: gr.GetName(), - UID: m.NewOwnerID, + UID: int(m.NewOwnerID), Private: m.Private, }) return m.repository, err From f92784c0b6db31e076345426d97aed79c4fb463d Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Wed, 4 Jul 2018 22:38:53 +0000 Subject: [PATCH 2/3] Add title and note to releases (#20) --- .changelog.yml | 9 +++++++++ .drone.yml | 4 +++- Makefile | 4 ++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 .changelog.yml diff --git a/.changelog.yml b/.changelog.yml new file mode 100644 index 0000000..2b4f1d0 --- /dev/null +++ b/.changelog.yml @@ -0,0 +1,9 @@ +## ENHANCEMENTS +* Fetch user if no --owner is given + +## BUILD + +* Add docker release +* Add tests +* Add makefile +* Add S3 distrubution \ No newline at end of file diff --git a/.drone.yml b/.drone.yml index 111d9da..bcacdfa 100644 --- a/.drone.yml +++ b/.drone.yml @@ -30,7 +30,7 @@ pipeline: environment: GOPATH: /go commands: - - make release + - make generate-release-file release when: event: [ push, tag ] branch: [ master ] @@ -39,6 +39,8 @@ pipeline: pull: true base_url: "https://git.jonasfranz.software" secrets: [ gitea_token ] + title: .version + note: .changelog.yml files: - releases/* checksum: diff --git a/Makefile b/Makefile index 074ca65..afd337f 100644 --- a/Makefile +++ b/Makefile @@ -21,6 +21,10 @@ all: docker-binary: go build -ldflags "$(LDFLAGS)" -o gitea-github-migrator +.PHONY: generate-release-file +generate-release-file: + echo $(VERSION) > .version + .PHONY: release release: @hash gox > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ From afd81459b913c8c677c0c64a127980563cee7a0a Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Thu, 5 Jul 2018 00:42:25 +0200 Subject: [PATCH 3/3] Fix release builds Signed-off-by: Jonas Franz --- .drone.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index bcacdfa..8713144 100644 --- a/.drone.yml +++ b/.drone.yml @@ -32,8 +32,17 @@ pipeline: commands: - make generate-release-file release when: - event: [ push, tag ] + event: [ push ] branch: [ master ] + static: + image: golang:1.10 + pull: true + environment: + GOPATH: /go + commands: + - make generate-release-file release + when: + event: [ tag ] gitea: image: plugins/gitea-release:latest pull: true