Skip to content

Commit

Permalink
feat: post-template clone massive update
Browse files Browse the repository at this point in the history
  • Loading branch information
moul committed Dec 22, 2020
1 parent 53673fb commit f89704b
Show file tree
Hide file tree
Showing 14 changed files with 59 additions and 108 deletions.
2 changes: 1 addition & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
}
],
"contributorsPerLine": 7,
"projectName": "golang-repo-template",
"projectName": "progress",
"projectOwner": "moul",
"repoType": "github",
"repoHost": "https://github.com",
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Build the container image
uses: docker/build-push-action@v2
with:
repository: golang-repo-template
repository: progress

- name: Push to GitHub Packages
uses: docker/build-push-action@v2
Expand All @@ -27,7 +27,7 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
registry: docker.pkg.github.com
repository: moul/golang-repo-template/golang-repo-template
repository: moul/progress/progress
tag_with_ref: true

- name: Check Docker Hub Credentials
Expand Down Expand Up @@ -56,5 +56,5 @@ jobs:
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
repository: moul/golang-repo-template
repository: moul/progress
tag_with_ref: true
10 changes: 5 additions & 5 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,20 +51,20 @@ archives:
wrap_in_directory: true
brews:
-
name: golang-repo-template
name: progress
# github:
# owner: moul
# name: homebrew-moul
commit_author:
name: moul-bot
email: "bot@moul.io"
homepage: https://github.com/moul/golang-repo-template
description: "golang-repo-template"
homepage: https://github.com/moul/progress
description: "progress"
nfpms:
-
file_name_template: '{{ .ProjectName }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
homepage: https://github.com/moul/golang-repo-template
description: "golang-repo-template"
homepage: https://github.com/moul/progress
description: "progress"
maintainer: "Manfred Touron <https://manfred.life>"
license: "Apache-2.0 OR MIT"
vendor: moul
Expand Down
8 changes: 4 additions & 4 deletions COPYRIGHT
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
Copyright 2020 Manfred Touron and other golang-repo-template Developers.
Copyright 2020 Manfred Touron and other progress Developers.

Intellectual Property Notice
----------------------------

golang-repo-template is licensed under the Apache License, Version 2.0
progress is licensed under the Apache License, Version 2.0
(see LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0) or
the MIT license (see LICENSE-MIT or http://opensource.org/licenses/MIT),
at your option.

Copyrights and patents in the golang-repo-templates project are retained
Copyrights and patents in the progresss project are retained
by contributors.
No copyright assignment is required to contribute to golang-repo-template.
No copyright assignment is required to contribute to progress.

SPDX-License-Identifier: (Apache-2.0 OR MIT)

Expand Down
16 changes: 8 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARG VERSION
FROM golang:1.15.6-alpine as builder
RUN apk add --no-cache git gcc musl-dev make
ENV GO111MODULE=on
WORKDIR /go/src/moul.io/golang-repo-template
WORKDIR /go/src/moul.io/progress
COPY go.* ./
RUN go mod download
COPY . ./
Expand All @@ -16,16 +16,16 @@ RUN make install
# minimalist runtime
FROM alpine:3.12
LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.name="golang-repo-template" \
org.label-schema.name="progress" \
org.label-schema.description="" \
org.label-schema.url="https://moul.io/golang-repo-template/" \
org.label-schema.url="https://moul.io/progress/" \
org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vcs-url="https://github.com/moul/golang-repo-template" \
org.label-schema.vcs-url="https://github.com/moul/progress" \
org.label-schema.vendor="Manfred Touron" \
org.label-schema.version=$VERSION \
org.label-schema.schema-version="1.0" \
org.label-schema.cmd="docker run -i -t --rm moul/golang-repo-template" \
org.label-schema.help="docker exec -it $CONTAINER golang-repo-template --help"
COPY --from=builder /go/bin/golang-repo-template /bin/
ENTRYPOINT ["/bin/golang-repo-template"]
org.label-schema.cmd="docker run -i -t --rm moul/progress" \
org.label-schema.help="docker exec -it $CONTAINER progress --help"
COPY --from=builder /go/bin/progress /bin/
ENTRYPOINT ["/bin/progress"]
#CMD []
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GOPKG ?= moul.io/golang-repo-template
DOCKER_IMAGE ?= moul/golang-repo-template
GOPKG ?= moul.io/progress
DOCKER_IMAGE ?= moul/progress
GOBINS ?= .
NPM_PACKAGES ?= .

Expand All @@ -8,8 +8,8 @@ include rules.mk
generate: install
GO111MODULE=off go get github.com/campoy/embedmd
mkdir -p .tmp
echo 'foo@bar:~$$ golang-repo-template hello world' > .tmp/usage.txt
golang-repo-template hello world 2>&1 >> .tmp/usage.txt
echo 'foo@bar:~$$ progress hello world' > .tmp/usage.txt
progress hello world 2>&1 >> .tmp/usage.txt
embedmd -w README.md
rm -rf .tmp
.PHONY: generate
Expand Down
42 changes: 21 additions & 21 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,48 +1,48 @@
# golang-repo-template
# progress

:smile: golang-repo-template
:smile: progress

[![go.dev reference](https://img.shields.io/badge/go.dev-reference-007d9c?logo=go&logoColor=white)](https://pkg.go.dev/moul.io/golang-repo-template)
[![License](https://img.shields.io/badge/license-Apache--2.0%20%2F%20MIT-%2397ca00.svg)](https://github.com/moul/golang-repo-template/blob/master/COPYRIGHT)
[![GitHub release](https://img.shields.io/github/release/moul/golang-repo-template.svg)](https://github.com/moul/golang-repo-template/releases)
[![Docker Metrics](https://images.microbadger.com/badges/image/moul/golang-repo-template.svg)](https://microbadger.com/images/moul/golang-repo-template)
[![go.dev reference](https://img.shields.io/badge/go.dev-reference-007d9c?logo=go&logoColor=white)](https://pkg.go.dev/moul.io/progress)
[![License](https://img.shields.io/badge/license-Apache--2.0%20%2F%20MIT-%2397ca00.svg)](https://github.com/moul/progress/blob/master/COPYRIGHT)
[![GitHub release](https://img.shields.io/github/release/moul/progress.svg)](https://github.com/moul/progress/releases)
[![Docker Metrics](https://images.microbadger.com/badges/image/moul/progress.svg)](https://microbadger.com/images/moul/progress)
[![Made by Manfred Touron](https://img.shields.io/badge/made%20by-Manfred%20Touron-blue.svg?style=flat)](https://manfred.life/)

[![Go](https://github.com/moul/golang-repo-template/workflows/Go/badge.svg)](https://github.com/moul/golang-repo-template/actions?query=workflow%3AGo)
[![Release](https://github.com/moul/golang-repo-template/workflows/Release/badge.svg)](https://github.com/moul/golang-repo-template/actions?query=workflow%3ARelease)
[![PR](https://github.com/moul/golang-repo-template/workflows/PR/badge.svg)](https://github.com/moul/golang-repo-template/actions?query=workflow%3APR)
[![GolangCI](https://golangci.com/badges/github.com/moul/golang-repo-template.svg)](https://golangci.com/r/github.com/moul/golang-repo-template)
[![codecov](https://codecov.io/gh/moul/golang-repo-template/branch/master/graph/badge.svg)](https://codecov.io/gh/moul/golang-repo-template)
[![Go Report Card](https://goreportcard.com/badge/moul.io/golang-repo-template)](https://goreportcard.com/report/moul.io/golang-repo-template)
[![CodeFactor](https://www.codefactor.io/repository/github/moul/golang-repo-template/badge)](https://www.codefactor.io/repository/github/moul/golang-repo-template)
[![Go](https://github.com/moul/progress/workflows/Go/badge.svg)](https://github.com/moul/progress/actions?query=workflow%3AGo)
[![Release](https://github.com/moul/progress/workflows/Release/badge.svg)](https://github.com/moul/progress/actions?query=workflow%3ARelease)
[![PR](https://github.com/moul/progress/workflows/PR/badge.svg)](https://github.com/moul/progress/actions?query=workflow%3APR)
[![GolangCI](https://golangci.com/badges/github.com/moul/progress.svg)](https://golangci.com/r/github.com/moul/progress)
[![codecov](https://codecov.io/gh/moul/progress/branch/master/graph/badge.svg)](https://codecov.io/gh/moul/progress)
[![Go Report Card](https://goreportcard.com/badge/moul.io/progress)](https://goreportcard.com/report/moul.io/progress)
[![CodeFactor](https://www.codefactor.io/repository/github/moul/progress/badge)](https://www.codefactor.io/repository/github/moul/progress)

[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/moul/golang-repo-template)
[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/moul/progress)

## Usage

[embedmd]:# (.tmp/usage.txt console)
```console
foo@bar:~$ golang-repo-template hello world
foo@bar:~$ progress hello world
_ _ _ _
__ _ ___ | | __ _ _ _ __ _ ___ _ _ ___ _ __ ___ ___ | |_ ___ _ __ _ __ | | __ _ | |_ ___
/ _` |/ _ \| |/ _` || ' \ / _` ||___|| '_|/ -_)| '_ \/ _ \|___|| _|/ -_)| ' \ | '_ \| |/ _` || _|/ -_)
\__, |\___/|_|\__,_||_||_|\__, | |_| \___|| .__/\___/ \__|\___||_|_|_|| .__/|_|\__,_| \__|\___|
|___/ |___/ |_| |_|
12 CPUs, /home/moul/go/bin/golang-repo-template, fwrz, go1.15.5
args ["golang-repo-template","hello","world"]
12 CPUs, /home/moul/go/bin/progress, fwrz, go1.15.5
args ["progress","hello","world"]
```

## Install

### Using go

```sh
go get moul.io/golang-repo-template
go get moul.io/progress
```

### Releases

See https://github.com/moul/golang-repo-template/releases
See https://github.com/moul/progress/releases

## Contribute

Expand All @@ -69,7 +69,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<!-- markdownlint-disable -->
<table>
<tr>
<td align="center"><a href="http://manfred.life"><img src="https://avatars1.githubusercontent.com/u/94029?v=4" width="100px;" alt=""/><br /><sub><b>Manfred Touron</b></sub></a><br /><a href="#maintenance-moul" title="Maintenance">🚧</a> <a href="https://github.com/moul/golang-repo-template/commits?author=moul" title="Documentation">📖</a> <a href="https://github.com/moul/golang-repo-template/commits?author=moul" title="Tests">⚠️</a> <a href="https://github.com/moul/golang-repo-template/commits?author=moul" title="Code">💻</a></td>
<td align="center"><a href="http://manfred.life"><img src="https://avatars1.githubusercontent.com/u/94029?v=4" width="100px;" alt=""/><br /><sub><b>Manfred Touron</b></sub></a><br /><a href="#maintenance-moul" title="Maintenance">🚧</a> <a href="https://github.com/moul/progress/commits?author=moul" title="Documentation">📖</a> <a href="https://github.com/moul/progress/commits?author=moul" title="Tests">⚠️</a> <a href="https://github.com/moul/progress/commits?author=moul" title="Code">💻</a></td>
<td align="center"><a href="https://manfred.life/moul-bot"><img src="https://avatars1.githubusercontent.com/u/41326314?v=4" width="100px;" alt=""/><br /><sub><b>moul-bot</b></sub></a><br /><a href="#maintenance-moul-bot" title="Maintenance">🚧</a></td>
</tr>
</table>
Expand All @@ -83,7 +83,7 @@ specification. Contributions of any kind welcome!

### Stargazers over time

[![Stargazers over time](https://starchart.cc/moul/golang-repo-template.svg)](https://starchart.cc/moul/golang-repo-template)
[![Stargazers over time](https://starchart.cc/moul/progress.svg)](https://starchart.cc/moul/progress)

## License

Expand Down
10 changes: 5 additions & 5 deletions depaware.txt

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

2 changes: 1 addition & 1 deletion doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@
// |/ | | \ \ / / ' \/ _ \/ // / / |
// || | | | | | /_/_/_/\___/\_,_/_/ |
// +--------------------------------------------------------------+
package main // import "moul.io/golang-repo-template"
package progress // import "moul.io/progress"
2 changes: 1 addition & 1 deletion go.mod

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

31 changes: 0 additions & 31 deletions main.go

This file was deleted.

18 changes: 0 additions & 18 deletions main_test.go

This file was deleted.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{
"_comment": "this project is not a node.js one, package.json is just used to define some metadata",
"name": "@moul.io/golang-repo-template",
"name": "@moul.io/progress",
"version": "0.0.1",
"author": "Manfred Touron <oss@moul.io> (https://manfred.life)",
"contributors": [
"Manfred Touron <oss@moul.io> (https://manfred.life)"
],
"license": "(Apache-2.0 OR MIT)",
"scripts": {
"start": "golang-repo-template",
"start": "progress",
"install": "make install",
"test": "make test"
},
"repository": {
"type": "git",
"url": "https://github.com/moul/golang-repo-template.git"
"url": "https://github.com/moul/progress.git"
},
"bugs": "https://github.com/moul/golang-repo-template/issues",
"homepage": "https://moul.io/golang-repo-template"
"bugs": "https://github.com/moul/progress/issues",
"homepage": "https://moul.io/progress"
}
2 changes: 1 addition & 1 deletion tool/lint/.spelling
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
golang-repo-template
progress
Touron
CONTRIBUTING.md

0 comments on commit f89704b

Please sign in to comment.