Merge pull request #50 from ergochat/readline_bump

upgrade readline, update goreleaser to v2
ergochat · Jul 14, 2024 · 7f70307 · 7f70307
2 parents 68df1fe + 67b1646
commit 7f70307
Show file tree

Hide file tree

Showing 7 changed files with 76 additions and 15 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -1,5 +1,6 @@
 # .goreleaser.yml
 # Build customization
+version: 2
 project_name: ircdog
 builds:
   - main: ircdog.go
@@ -31,11 +32,12 @@ builds:
 
 archives:
   -
-    name_template: "{{ .ProjectName }}-{{ .Version }}-{{ .Os }}-{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
+    name_template: >-
+            {{ .ProjectName }}-{{ .Version }}-
+            {{- if eq .Os "darwin" }}macos{{- else }}{{ .Os }}{{ end -}}-
+            {{- if eq .Arch "amd64" }}x86_64{{- else }}{{ .Arch }}{{ end -}}
+            {{ if .Arm }}v{{ .Arm }}{{ end -}}
     format: tar.gz
-    replacements:
-      amd64: x86_64
-      darwin: macos
     format_overrides:
       - goos: windows
         format: zip

diff --git a/Makefile b/Makefile
@@ -19,7 +19,7 @@ install:
 	go install -v -ldflags "-X main.commit=$(GIT_COMMIT) -X main.version=$(GIT_TAG)"
 
 release:
-	goreleaser --skip-publish --clean
+	goreleaser --skip=publish --clean
 
 test:
 	go test ./...

diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.19
 require (
 	github.com/docopt/docopt-go v0.0.0-20160216232012-784ddc588536
 	github.com/ergochat/irc-go v0.3.0
-	github.com/ergochat/readline v0.1.1
+	github.com/ergochat/readline v0.1.2
 	github.com/gorilla/websocket v1.5.0
 	github.com/jwalton/go-supportscolor v1.1.0
 	golang.org/x/term v0.6.0

diff --git a/go.sum b/go.sum
@@ -2,8 +2,8 @@ github.com/docopt/docopt-go v0.0.0-20160216232012-784ddc588536 h1:rHnpq7uNlix5l7
 github.com/docopt/docopt-go v0.0.0-20160216232012-784ddc588536/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
 github.com/ergochat/irc-go v0.3.0 h1:qgvb2knh8d6yIVsHX+PRQ2CiRj1NGG5x88ABmR1lWng=
 github.com/ergochat/irc-go v0.3.0/go.mod h1:2vi7KNpIPWnReB5hmLpl92eMywQvuIeIIGdt/FQCph0=
-github.com/ergochat/readline v0.1.1 h1:C8Uuo3ybB23GWOt0uxmHbGzKM9owmtXary6Clrj84s0=
-github.com/ergochat/readline v0.1.1/go.mod h1:o3ux9QLHLm77bq7hDB21UTm6HlV2++IPDMfIfKDuOgY=
+github.com/ergochat/readline v0.1.2 h1:zxiwQB8DyTLD0HSWthJlnvs5E2X1qnyXZ44RFf1jRlg=
+github.com/ergochat/readline v0.1.2/go.mod h1:o3ux9QLHLm77bq7hDB21UTm6HlV2++IPDMfIfKDuOgY=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/jwalton/go-supportscolor v1.1.0 h1:HsXFJdMPjRUAx8cIW6g30hVSFYaxh9yRQwEWgkAR7lQ=

diff --git a/vendor/github.com/ergochat/readline/operation.go b/vendor/github.com/ergochat/readline/operation.go
diff --git a/vendor/github.com/ergochat/readline/terminal.go b/vendor/github.com/ergochat/readline/terminal.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -6,7 +6,7 @@ github.com/docopt/docopt-go
 github.com/ergochat/irc-go/ircfmt
 github.com/ergochat/irc-go/ircmsg
 github.com/ergochat/irc-go/ircreader
-# github.com/ergochat/readline v0.1.1
+# github.com/ergochat/readline v0.1.2
 ## explicit; go 1.19
 github.com/ergochat/readline
 github.com/ergochat/readline/internal/ansi