Skip to content

Commit

Permalink
move to fortio.org for package. use go 1.20 and built in coverage. (#54)
Browse files Browse the repository at this point in the history
* move to fortio.org for package. use go 1.20 and built in coverage. use hacked together standalone testscript fork
  • Loading branch information
ldemailly authored Mar 29, 2023
1 parent 49412a5 commit 42fa0b4
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 19 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ jobs:
- uses: actions/checkout@master
- uses: actions/setup-go@v4
with:
go-version: '1.19'
go-version: 'stable'
check-latest: true
- name: Run test coverage
run: go test -race -coverprofile=coverage.out -covermode=atomic ./...
- uses: codecov/codecov-action@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/releaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4 # pin@v3
with:
go-version: '1.19'
go-version: '1.20'
check-latest: true
- name: Log in to Docker Hub
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # pin@v2
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ It will also print information about certificates, including the shortest expira

If you have a recent go installation already:
```shell
CGO_ENABLED=0 go install github.com/fortio/multicurl@latest
CGO_ENABLED=0 go install fortio.org/multicurl@latest
```

Or get on of the [binary releases](https://github.com/fortio/multicurl/releases)
Expand Down
2 changes: 1 addition & 1 deletion cli/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

"fortio.org/cli"
"fortio.org/log"
"github.com/fortio/multicurl/mc"
"fortio.org/multicurl/mc"
)

// -- Support for multiple instances of -H flag on cmd line.
Expand Down
2 changes: 1 addition & 1 deletion cli/multicurl.txtar
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ stderr 'I Resolved ip localhost:9099 to port 9099 and 2 addresses \[::1 127.0.0.

# resolve failure
! multicurl -quiet doesntexist.fortio.org
stderr 'E Unable to lookup "doesntexist.fortio.org": lookup doesntexist.fortio.org: no such host'
stderr 'E Unable to lookup "doesntexist.fortio.org": lookup doesntexist.fortio.org.*: no such host'
! stderr 'I Total iterations'

# redirect
Expand Down
4 changes: 2 additions & 2 deletions cli/multicurl_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"os"
"testing"

"github.com/fortio/multicurl/cli"
"github.com/rogpeppe/go-internal/testscript"
"fortio.org/multicurl/cli"
"fortio.org/testscript"
)

func TestMain(m *testing.M) {
Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
module github.com/fortio/multicurl
module fortio.org/multicurl

go 1.18

require (
fortio.org/cli v1.1.0
fortio.org/log v1.3.0
fortio.org/testscript v0.1.0
fortio.org/version v1.0.2
github.com/rogpeppe/go-internal v1.9.0
)

require github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e // indirect
require golang.org/x/tools v0.1.12 // indirect
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ fortio.org/cli v1.1.0 h1:ATIxi7DgA7WAexUCF8p5a0qlGYk48ZgkwSEDrvwXeN4=
fortio.org/cli v1.1.0/go.mod h1:O3nVImKwJSvHKbMYWkqMbEagAXCS1xvSv1YbHwkKJjY=
fortio.org/log v1.3.0 h1:bESPvuQGKejw7rrx41Sg3GoF+tsrB7oC08PxBs5/AM0=
fortio.org/log v1.3.0/go.mod h1:u/8/2lyczXq52aT5Nw6reD+3cR6m/EbS2jBiIYhgiTU=
fortio.org/testscript v0.1.0 h1:UY0mxYOVWX7gwxkVL2k1g8RG9nzv76N2eq9p7I3IOrU=
fortio.org/testscript v0.1.0/go.mod h1:186kIf6xPW12LeUT65zR6gjfy5J5lGZLwL9Bi5LItf4=
fortio.org/version v1.0.2 h1:8NwxdX58aoeKx7T5xAPO0xlUu1Hpk42nRz5s6e6eKZ0=
fortio.org/version v1.0.2/go.mod h1:2JQp9Ax+tm6QKiGuzR5nJY63kFeANcgrZ0osoQFDVm0=
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e h1:aoZm08cpOy4WuID//EZDgcC4zIxODThtZNPirFr42+A=
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
2 changes: 1 addition & 1 deletion mc/mc.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ var (
)

func init() {
libShortVersion, libLongVersion, _ = version.FromBuildInfoPath("github.com/fortio/multicurl")
libShortVersion, libLongVersion, _ = version.FromBuildInfoPath("fortio.org/multicurl")
}

// MultiCurl is the main function of the multicurl tool. timeout is per request/ip.
Expand Down
6 changes: 3 additions & 3 deletions mc/mc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"os"
"testing"

"github.com/fortio/multicurl/cli"
"github.com/fortio/multicurl/mc"
"github.com/rogpeppe/go-internal/testscript"
"fortio.org/multicurl/cli"
"fortio.org/multicurl/mc"
"fortio.org/testscript"
)

func TestMain(m *testing.M) {
Expand Down
2 changes: 1 addition & 1 deletion multicurl.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package main
import (
"os"

"github.com/fortio/multicurl/cli"
"fortio.org/multicurl/cli"
)

func main() {
Expand Down

0 comments on commit 42fa0b4

Please sign in to comment.