bump: Cleanup config, add config for release.yml

wader · Oct 5, 2021 · 71e87e6 · 71e87e6
1 parent b641c77
commit 71e87e6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,7 +6,6 @@ on:
       - "master"
   pull_request:
 
-# bump: ci-golangci-lint /GOLANGCILINT_VERSION: ([\d.]+)/ git:https://github.com/golangci/golangci-lint.git|^1
 env:
   GOLANGCILINT_VERSION: 1.42.1
 
@@ -23,7 +22,6 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v2
         with:
-          # bump: ci-golang /go-version: ([\d.]+)/ git:https://github.com/actions/go-versions.git|/(.*)-.*/$1/|^1
           go-version: 1.17.1
       - name: Lint
         uses: golangci/golangci-lint-action@v2

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -3,7 +3,7 @@ name: Release
 on:
   push:
     tags:
-      - 'v*'
+      - "v*"
 
 permissions:
   contents: write
@@ -19,7 +19,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17.0
+          go-version: 1.17.1
       - name: Run goreleaser
         uses: goreleaser/goreleaser-action@v2
         with:

diff --git a/Bumpfile b/Bumpfile
@@ -1,4 +1,8 @@
 Dockerfile
 Makefile
 go.mod
+
+github-golangci-lint /GOLANGCILINT_VERSION: ([\d.]+)/ git:https://github.com/golangci/golangci-lint.git|^1
+github-go-version /go-version: ([\d.]+)/ git:https://github.com/actions/go-versions.git|/(.*)-.*/$1/|^1
 .github/workflows/ci.yml
+.github/workflows/release.yml
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-# bump: golang /FROM golang:([\d.]+)/ docker:golang|^1
+# bump: docker-golang /FROM golang:([\d.]+)/ docker:golang|^1
 FROM golang:1.17.1-bullseye AS base
 
 # expect is used to test cli
@@ -10,7 +10,7 @@ RUN \
 # docker build --target dev -t fq-dev - < Dockerfile && docker run --rm -ti -v "$PWD:/$PWD" -w "$PWD" fq-dev
 FROM base AS dev
 
-# bump: golangci-lint /GOLANGCILINT_VERSION=([\d.]+)/ git:https://github.com/golangci/golangci-lint.git|^1
+# bump: docker-golangci-lint /GOLANGCILINT_VERSION=([\d.]+)/ git:https://github.com/golangci/golangci-lint.git|^1
 ARG GOLANGCILINT_VERSION=1.42.1
 RUN \
     curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | \

diff --git a/go.mod b/go.mod
@@ -3,20 +3,20 @@ module github.com/wader/fq
 go 1.17
 
 require (
-	// bump: mapstructure /github.com\/mitchellh\/mapstructure v(.*)/ git://github.com/mitchellh/mapstructure|^1
-	// bump: mapstructure command go get -d github.com/mitchellh/mapstructure@v$LATEST && go mod tidy
+	// bump: gomod-mapstructure /github.com\/mitchellh\/mapstructure v(.*)/ git://github.com/mitchellh/mapstructure|^1
+	// bump: gomod-mapstructure command go get -d github.com/mitchellh/mapstructure@v$LATEST && go mod tidy
 	github.com/mitchellh/mapstructure v1.4.2
-	// bump: go-difflib /github.com\/pmezard\/go-difflib v(.*)/ git://github.com/pmezard/go-difflib|^1
-	// bump: go-difflib command go get -d github.com/pmezard/go-difflib@v$LATEST && go mod tidy
+	// bump: gomod-go-difflib /github.com\/pmezard\/go-difflib v(.*)/ git://github.com/pmezard/go-difflib|^1
+	// bump: gomod-go-difflib command go get -d github.com/pmezard/go-difflib@v$LATEST && go mod tidy
 	github.com/pmezard/go-difflib v1.0.0
 
 	// fork of github.com/itchyny/gojq, see github.com/wader/gojq fq branch
 	github.com/wader/gojq v0.12.1-0.20211002095356-5f036ee71f5e
 	// fork of github.com/chzyer/readline, see github.com/wader/readline fq branch
 	github.com/wader/readline v0.0.0-20210920124728-5a81f7707bac
 
-	// bump: golang/text /golang\.org\/x\/text v(.*)/ git://github.com/golang/text|^0
-	// bump: golang/text command go get -d golang.org/x/text@v$LATEST && go mod tidy
+	// bump: gomod-golang/text /golang\.org\/x\/text v(.*)/ git://github.com/golang/text|^0
+	// bump: gomod-golang/text command go get -d golang.org/x/text@v$LATEST && go mod tidy
 	golang.org/x/text v0.3.7
 )