Merge pull request #1 from moul/dev/moul/v1

.all-contributorsrc

@@ -29,7 +29,7 @@
     }
   ],
   "contributorsPerLine": 7,
-  "projectName": "golang-repo-template",
+  "projectName": "zapring",
   "projectOwner": "moul",
   "repoType": "github",
   "repoHost": "https://github.com",

.github/workflows/go.yml

@@ -26,37 +26,14 @@ on:
       - ".github/workflows/go.yml"
 
 jobs:
-  goreleaser-dryrun:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@master
-      - name: Set up Go
-        uses: actions/setup-go@v2
-        with:
-          go-version: 1.16.x
-      - name: Cache Go modules
-        uses: actions/[email protected]
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-      - name: Run GoReleaser (Dry Run)
-        uses: goreleaser/goreleaser-action@v2
-        with:
-          version: latest
-          args: release --rm-dist --snapshot --skip-publish
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   golangci-lint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: golangci-lint
         uses: golangci/[email protected]
         with:
-          version: v1.31
+          version: v1.38
           #github-token: ${{ secrets.GITHUB_TOKEN }}
           args: --timeout=2m
           only-new-issues: false

.github/workflows/release.yml

@@ -27,24 +27,24 @@ jobs:
         uses: actions/setup-go@v2
         with:
           go-version: 1.15.x
-      -
-        name: Cache Go modules
-        if: steps.semantic.outputs.new-release-published == 'true'
-        uses: actions/[email protected]
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-      -
-        name: Run GoReleaser
-        if: steps.semantic.outputs.new-release-published == 'true'
-        uses: goreleaser/goreleaser-action@v2
-        with:
-          version: latest
-          args: release --rm-dist
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      #-
+      #  name: Cache Go modules
+      #  if: steps.semantic.outputs.new-release-published == 'true'
+      #  uses: actions/[email protected]
+      #  with:
+      #    path: ~/go/pkg/mod
+      #    key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+      #    restore-keys: |
+      #      ${{ runner.os }}-go-
+      #-
+      #  name: Run GoReleaser
+      #  if: steps.semantic.outputs.new-release-published == 'true'
+      #  uses: goreleaser/goreleaser-action@v2
+      #  with:
+      #    version: latest
+      #    args: release --rm-dist
+      #  env:
+      #    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Register version on pkg.go.dev
         if: steps.semantic.outputs.new-release-published == 'true'

COPYRIGHT

@@ -1,16 +1,16 @@
-Copyright 2021  Manfred Touron and other golang-repo-template Developers.
+Copyright 2021  Manfred Touron and other zapring Developers.
 
 Intellectual Property Notice
 ----------------------------
 
-golang-repo-template is licensed under the Apache License, Version 2.0
+zapring 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 zaprings project are retained
 by contributors.
-No copyright assignment is required to contribute to golang-repo-template.
+No copyright assignment is required to contribute to zapring.
 
     SPDX-License-Identifier: (Apache-2.0 OR MIT)
 

Makefile

@@ -1,15 +1,14 @@
-GOPKG ?=	moul.io/golang-repo-template
-DOCKER_IMAGE ?=	moul/golang-repo-template
+GOPKG ?=	moul.io/zapring
+DOCKER_IMAGE ?=	moul/zapring
 GOBINS ?=	.
 NPM_PACKAGES ?=	.
 
 include rules.mk
 
-generate: install
+generate:
 	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
+	go doc -all > .tmp/usage.txt
 	embedmd -w README.md
 	rm -rf .tmp
 .PHONY: generate