Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
IngmarStein committed May 23, 2024
1 parent 1ea9b19 commit 67f5398
Show file tree
Hide file tree
Showing 17 changed files with 63 additions and 326 deletions.
17 changes: 7 additions & 10 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,16 @@ jobs:
goreleaser:
runs-on: ubuntu-latest
steps:
-
name: Checkout
uses: actions/checkout@v2
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
-
name: Set up Go
uses: actions/setup-go@v2
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.16
-
name: Run GoReleaser
uses: goreleaser/goreleaser-action@v2
go-version: 'stable'
- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v5
with:
version: latest
args: release --rm-dist
Expand Down
12 changes: 5 additions & 7 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,13 @@ builds:
- env:
- CGO_ENABLED=0
ldflags:
- -s -w -X github.com/xujiahua/tcp-multiplexer/cmd.version={{.Version}} -X github.com/xujiahua/tcp-multiplexer/cmd.commit={{.Commit}} -X github.com/xujiahua/tcp-multiplexer/cmd.date={{.Date}} -X github.com/xujiahua/tcp-multiplexer/cmd.builtBy=goreleaser
- -s -w -X github.com/ingmarstein/tcp-multiplexer/cmd.version={{.Version}} -X github.com/ingmarstein/tcp-multiplexer/cmd.commit={{.Commit}} -X github.com/ingmarstein/tcp-multiplexer/cmd.date={{.Date}} -X github.com/ingmarstein/tcp-multiplexer/cmd.builtBy=goreleaser
goos:
- linux
- windows
- darwin
archives:
- replacements:
darwin: Darwin
linux: Linux
windows: Windows
386: i386
amd64: x86_64
- name_template: '{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
checksum:
name_template: 'checksums.txt'
snapshot:
Expand All @@ -29,3 +24,6 @@ changelog:
exclude:
- '^docs:'
- '^test:'
dockers:
- image_templates:
- ingmarstein/tcp-multiplexer
3 changes: 3 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FROM scratch
ENTRYPOINT ["/tcp-multiplexer"]
COPY tcp-multiplexer /
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
.phony: fmt run run-8583 echo-client http-client-nobody http-client-body http-client-form build

fmt:
go fmt ./...
run:fmt
run: fmt
go run main.go server -v -p http
run-8583:fmt
run-8583: fmt
go run main.go server -v -p iso8583
echo-client:
nc 127.0.0.1 8000
Expand All @@ -14,5 +16,5 @@ http-client-body:
http-client-form:
curl -v -X POST -F key1=value1 http://127.0.0.1:8000

build:fmt
go build
build: fmt
go build
4 changes: 2 additions & 2 deletions cmd/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
Expand All @@ -17,8 +17,8 @@ package cmd

import (
"fmt"
"github.com/ingmarstein/tcp-multiplexer/pkg/message"
"github.com/spf13/cobra"
"github.com/xujiahua/tcp-multiplexer/pkg/message"
)

// listCmd represents the list command
Expand Down
4 changes: 2 additions & 2 deletions cmd/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ THE SOFTWARE.
package cmd

import (
"github.com/ingmarstein/tcp-multiplexer/pkg/message"
"github.com/ingmarstein/tcp-multiplexer/pkg/multiplexer"
"github.com/sirupsen/logrus"
"github.com/xujiahua/tcp-multiplexer/pkg/message"
"github.com/xujiahua/tcp-multiplexer/pkg/multiplexer"
"os"
"os/signal"
"syscall"
Expand Down
2 changes: 1 addition & 1 deletion cmd/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
Expand Down
2 changes: 1 addition & 1 deletion example/dummy-iso8583-client/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"encoding/binary"
"fmt"
"github.com/davecgh/go-spew/spew"
"github.com/xujiahua/tcp-multiplexer/pkg/message"
"github.com/ingmarstein/tcp-multiplexer/pkg/message"
"net"
"os"
)
Expand Down
2 changes: 1 addition & 1 deletion example/dummy-iso8583-server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package main

import (
"fmt"
"github.com/xujiahua/tcp-multiplexer/pkg/message"
"github.com/ingmarstein/tcp-multiplexer/pkg/message"
"io"
"net"
"os"
Expand Down
18 changes: 13 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
module github.com/xujiahua/tcp-multiplexer
module github.com/ingmarstein/tcp-multiplexer

go 1.16
go 1.22

require (
github.com/davecgh/go-spew v1.1.1
github.com/sirupsen/logrus v1.8.1
github.com/spf13/cobra v1.1.3
github.com/stretchr/testify v1.7.0
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.8.0
github.com/stretchr/testify v1.9.0
)

require (
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/sys v0.20.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 67f5398

Please sign in to comment.