From bd8403e70bf946d5b562127b40042940ebd2500c Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 14 Jun 2018 20:35:10 +0000 Subject: [PATCH 1/6] Makefile (#4) --- .drone.yml | 8 ++------ Makefile | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 Makefile diff --git a/.drone.yml b/.drone.yml index 4311106..12fc0dc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,18 +23,14 @@ pipeline: environment: GOPATH: /go commands: - - go get -u golang.org/x/lint/golint - - golint -set_exit_status $(go list ./...) - - go vet ./... - - go test -cover ./... + - make test static: image: golang:1.10 pull: true environment: GOPATH: /go commands: - - go get -u github.com/mitchellh/gox - - gox -ldflags "-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}" -output "releases/gitea-github-migrator_{{.OS}}_{{.Arch}}" + - make release when: event: [ tag ] gitea: diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..0c1ff02 --- /dev/null +++ b/Makefile @@ -0,0 +1,42 @@ +IMPORT := git.jonasfranz.software/JonasFranzDEV/gitea-github-migrator +GO ?= go + +BUILD=$(or ${DRONE_BUILD_NUMBER},${DRONE_BUILD_NUMBER},0) + +ifneq ($(DRONE_TAG),) + VERSION ?= $(subst v,,$(DRONE_TAG)) +else + ifneq ($(DRONE_BRANCH),) + VERSION ?= $(subst release/v,,$(DRONE_BRANCH)) + else + VERSION ?= master + endif +endif + +LDFLAGS := -X main.Version=$(VERSION) -X main.build=$(BUILD) + +.PHONY: all +all: + +.PHONY: release +release: + @hash gox > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ + $(GO) get -u github.com/mitchellh/gox; \ + fi + gox -ldflags "$(LDFLAGS)" -output "releases/gitea-github-migrator_{{.OS}}_{{.Arch}}" + +.PHONY: lint +lint: + @hash golint > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ + $(GO) get -u golang.org/x/lint/golint; \ + fi + golint -set_exit_status $(go list ./...) + +.PHONY: vet +vet: + go vet ./... + +.PHONY: test +test: lint vet + go test -cover ./... + \ No newline at end of file From 92b6438b558a390a2cf5a5e3f787803a2dd4d73a Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Mon, 18 Jun 2018 08:10:43 +0000 Subject: [PATCH 2/6] Add badge for latest release (#8) --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 85d60b4..fb83013 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # gitea-github-migrator [![Build Status](https://drone.jonasfranz.software/api/badges/JonasFranzDEV/gitea-github-migrator/status.svg)](https://drone.jonasfranz.software/JonasFranzDEV/gitea-github-migrator) +[![Latest Release](https://img.shields.io/badge/dynamic/json.svg?label=release&url=https%3A%2F%2Fgit.jonasfranz.software%2Fapi%2Fv1%2Frepos%2FJonasFranzDEV%2Fgitea-github-migrator%2Freleases&query=%24%5B0%5D.tag_name)](https://git.jonasfranz.software/JonasFranzDEV/gitea-github-migrator/releases) A tool to migrate [GitHub](https://github.com) Repositories to [Gitea](https://gitea.io) including all issues, labels, milestones and comments. From f05c383db255588825e3c0592fef314d6ce79656 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Mon, 18 Jun 2018 21:01:11 +0000 Subject: [PATCH 3/6] Add dockerfile (#7) --- .drone.yml | 10 +++++++++- Dockerfile | 18 ++++++++++++++++++ Makefile | 4 ++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 Dockerfile diff --git a/.drone.yml b/.drone.yml index 12fc0dc..f0e8fed 100644 --- a/.drone.yml +++ b/.drone.yml @@ -44,4 +44,12 @@ pipeline: - sha256 - md5 when: - event: [ tag ] \ No newline at end of file + event: [ tag ] + docker: + image: plugins/docker:17.12 + secrets: [ docker_username, docker_password ] + pull: true + repo: jonasfranz/gitea-github-migrator + default_tags: true + when: + event: [ push, tag ] diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..75344ba --- /dev/null +++ b/Dockerfile @@ -0,0 +1,18 @@ +#Build stage +FROM golang:1.10-alpine3.7 AS build-env + +#Build deps +RUN apk --no-cache add build-base git + +#Setup repo +COPY . ${GOPATH}/src/git.jonasfranz.software/JonasFranzDEV/gitea-github-migrator +WORKDIR ${GOPATH}/src/git.jonasfranz.software/JonasFranzDEV/gitea-github-migrator + +RUN make docker-binary + +FROM alpine:3.7 +LABEL maintainer="info@jonasfranz.software" + +COPY --from=build-env /go/src/git.jonasfranz.software/JonasFranzDEV/gitea-github-migrator/gitea-github-migrator /usr/local/bin/gitea-github-migrator + +ENTRYPOINT ["/usr/local/bin/gitea-github-migrator"] diff --git a/Makefile b/Makefile index 0c1ff02..e4d5b86 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ LDFLAGS := -X main.Version=$(VERSION) -X main.build=$(BUILD) .PHONY: all all: +.PHONY: docker-binary +docker-binary: + go build -ldflags "$(LDFLAGS)" -o gitea-github-migrator + .PHONY: release release: @hash gox > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ From d6c089a561f100065f84ee64503b0d27e262b8ae Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 19 Jun 2018 07:40:07 +0000 Subject: [PATCH 4/6] Remove example comments from Gopkg (#11) --- Gopkg.toml | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/Gopkg.toml b/Gopkg.toml index 27f06a5..0b5da9a 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -1,30 +1,3 @@ -# Gopkg.toml example -# -# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md -# for detailed Gopkg.toml documentation. -# -# required = ["github.com/user/thing/cmd/thing"] -# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] -# -# [[constraint]] -# name = "github.com/user/project" -# version = "1.0.0" -# -# [[constraint]] -# name = "github.com/user/project2" -# branch = "dev" -# source = "github.com/myfork/project2" -# -# [[override]] -# name = "github.com/x/y" -# version = "2.4.0" -# -# [prune] -# non-go = false -# go-tests = true -# unused-packages = true - - [prune] go-tests = true unused-packages = true From cecaa2f25090c81b1f6c942c353cd1a78a9b591e Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Tue, 19 Jun 2018 07:50:12 +0000 Subject: [PATCH 5/6] Limit drone docker build to master branch (#13) --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index f0e8fed..2a21e3e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -53,3 +53,4 @@ pipeline: default_tags: true when: event: [ push, tag ] + branch: [ master ] From b221b6d9dfe526ce201381c9bad0da1aa0f6f64c Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Tue, 19 Jun 2018 07:51:04 +0000 Subject: [PATCH 6/6] Add docker badge (#12) --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index fb83013..f9b36a5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # gitea-github-migrator [![Build Status](https://drone.jonasfranz.software/api/badges/JonasFranzDEV/gitea-github-migrator/status.svg)](https://drone.jonasfranz.software/JonasFranzDEV/gitea-github-migrator) [![Latest Release](https://img.shields.io/badge/dynamic/json.svg?label=release&url=https%3A%2F%2Fgit.jonasfranz.software%2Fapi%2Fv1%2Frepos%2FJonasFranzDEV%2Fgitea-github-migrator%2Freleases&query=%24%5B0%5D.tag_name)](https://git.jonasfranz.software/JonasFranzDEV/gitea-github-migrator/releases) +[![Docker Pulls](https://img.shields.io/docker/pulls/jonasfranz/gitea-github-migrator.svg)](https://hub.docker.com/r/jonasfranz/gitea-github-migrator/) A tool to migrate [GitHub](https://github.com) Repositories to [Gitea](https://gitea.io) including all issues, labels, milestones and comments.