Merge branch 'master' of ssh://git.jonasfranz.software:10022/JonasFranzDEV/gitea-github-migrator into web-ui

web-ui
Jonas Franz 6 years ago
commit 77bad57579
Signed by untrusted user: JonasFranzDEV
GPG Key ID: 506AEEBE80BEDECD
  1. 9
      .changelog.yml
  2. 15
      .drone.yml
  3. 4
      Makefile
  4. 7
      cmd/migrate-all.go
  5. 7
      cmd/migrate.go
  6. 2
      migrations/repo.go

@ -0,0 +1,9 @@
## ENHANCEMENTS
* Fetch user if no --owner is given
## BUILD
* Add docker release
* Add tests
* Add makefile
* Add S3 distrubution

@ -32,10 +32,19 @@ pipeline:
environment:
GOPATH: /go
commands:
- make release
- 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 ]
clean:
image: golang:1.10
pull: true
@ -48,6 +57,8 @@ pipeline:
pull: true
base_url: "https://git.jonasfranz.software"
secrets: [ gitea_token ]
title: .version
note: .changelog.yml
files:
- releases/*
checksum:

@ -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 \

@ -65,6 +65,13 @@ func runMigrateAll(ctx *cli.Context) error {
PullRequests: !onlyRepos,
Strategy: migrations.Classic,
}, gitea.NewClient(ctx.String("url"), ctx.String("token")), gc)
if job.Options.NewOwnerID == 0 {
usr, err := job.Client.GetMyUserInfo()
if err != nil {
return fmt.Errorf("cannot fetch user info about current user: %v", err)
}
job.Options.NewOwnerID = int(usr.ID)
}
for _, repo := range allRepos {
job.Repositories = append(job.Repositories, repo.GetFullName())
}

@ -50,6 +50,13 @@ func runMigrate(ctx *cli.Context) error {
PullRequests: !onlyRepos,
Strategy: migrations.Classic,
}, gitea.NewClient(ctx.String("url"), ctx.String("token")), gc, ctx.String("gh-repo"))
if job.Options.NewOwnerID == 0 {
usr, err := job.Client.GetMyUserInfo()
if err != nil {
return fmt.Errorf("cannot fetch user info about current user: %v", err)
}
job.Options.NewOwnerID = int(usr.ID)
}
errs := job.StartMigration()
for err := range errs {
if err != nil {

@ -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

Loading…
Cancel
Save