Skip to content

Commit

Permalink
Bump to Go 1.16, and GinkgoV2
Browse files Browse the repository at this point in the history
GinkgoV2 is backwards incompatible with v1,
about time to upgrade.
  • Loading branch information
rgalanakis committed Oct 19, 2022
1 parent f1bee74 commit edf4970
Show file tree
Hide file tree
Showing 18 changed files with 113 additions and 45 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/pr-checks.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
name: PR Checks
on: pull_request
on:
pull_request:
push: { branches: [master] }
jobs:
run-tests:
runs-on: ubuntu-latest
Expand All @@ -8,10 +10,10 @@ jobs:
uses: actions/checkout@v2
with:
ref: ${{ github.head_ref }}
- name: Set up Go 1.13.x
- name: Set up Go 1.16.x
uses: actions/setup-go@v1
with:
go-version: 1.13.x
go-version: 1.16.x
- uses: actions/cache@v1
with:
path: ~/go/pkg/mod
Expand Down
2 changes: 1 addition & 1 deletion api/api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
. "github.com/lithictech/go-aperitif/api/echoapitest"
. "github.com/lithictech/go-aperitif/apitest"
"github.com/lithictech/go-aperitif/logctx"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
. "github.com/rgalanakis/golangal"
"github.com/sirupsen/logrus"
Expand Down
2 changes: 1 addition & 1 deletion api/apiparams/apiparams_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/lithictech/go-aperitif/api/apiparams"
. "github.com/lithictech/go-aperitif/api/echoapitest"
. "github.com/lithictech/go-aperitif/apitest"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
. "github.com/rgalanakis/golangal"
"net/http"
Expand Down
2 changes: 1 addition & 1 deletion api/auth0jwt/auth0jwt_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package auth0jwt_test

import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"testing"
)
Expand Down
2 changes: 1 addition & 1 deletion api/preflight/preflight_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
. "github.com/lithictech/go-aperitif/api/echoapitest"
"github.com/lithictech/go-aperitif/api/preflight"
. "github.com/lithictech/go-aperitif/apitest"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
. "github.com/rgalanakis/golangal"
"testing"
Expand Down
2 changes: 1 addition & 1 deletion api/spa/spa_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
. "github.com/lithictech/go-aperitif/api/echoapitest"
"github.com/lithictech/go-aperitif/api/spa"
. "github.com/lithictech/go-aperitif/apitest"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
. "github.com/rgalanakis/golangal"
"net/http"
Expand Down
2 changes: 1 addition & 1 deletion async/async_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package async_test

import (
"github.com/lithictech/go-aperitif/async"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"testing"
)
Expand Down
10 changes: 5 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/lithictech/go-aperitif

go 1.13
go 1.16

require (
github.com/auth0/go-jwt-middleware v0.0.0-20200507191422-d30d7b9ece63
Expand All @@ -10,13 +10,13 @@ require (
github.com/jmoiron/sqlx v1.2.0
github.com/labstack/echo v3.3.10+incompatible
github.com/labstack/gommon v0.3.0 // indirect
github.com/onsi/ginkgo v1.12.2
github.com/onsi/gomega v1.10.1
github.com/onsi/ginkgo/v2 v2.3.1
github.com/onsi/gomega v1.22.0
github.com/pkg/errors v0.9.1
github.com/rgalanakis/golangal v0.0.0-20200710064529-eb44ace1b187
github.com/rgalanakis/golangal v1.1.0
github.com/rgalanakis/validator v0.0.0-20180731224108-4a34a8927f7c
github.com/sirupsen/logrus v1.6.0
github.com/valyala/fasttemplate v1.1.0 // indirect
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
google.golang.org/appengine v1.6.6 // indirect
)
109 changes: 88 additions & 21 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion jwtee/jwtee_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package jwtee_test
import (
"github.com/dgrijalva/jwt-go"
"github.com/lithictech/go-aperitif/jwtee"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
. "github.com/rgalanakis/golangal"
"testing"
Expand Down
3 changes: 1 addition & 2 deletions kronos/kronos_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ package kronos_test
import (
"fmt"
"github.com/lithictech/go-aperitif/kronos"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/extensions/table"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"math/rand"
"time"
Expand Down
2 changes: 1 addition & 1 deletion logctx/logctx_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package logctx_test
import (
"context"
"github.com/lithictech/go-aperitif/logctx"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/sirupsen/logrus"
"testing"
Expand Down
2 changes: 1 addition & 1 deletion parallel/parallel_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package parallel_test

import (
"github.com/lithictech/go-aperitif/parallel"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"sync"
"testing"
Expand Down
2 changes: 1 addition & 1 deletion quiz/quiz.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package quiz

import (
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"math/rand"
"os"
"strconv"
Expand Down
2 changes: 1 addition & 1 deletion quiz/quiz_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package quiz_test

import (
"github.com/lithictech/go-aperitif/quiz"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"testing"
)
Expand Down
2 changes: 1 addition & 1 deletion stopwatch/stopwatch_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package stopwatch_test

import (
"github.com/lithictech/go-aperitif/stopwatch"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/sirupsen/logrus"
"github.com/sirupsen/logrus/hooks/test"
Expand Down
2 changes: 1 addition & 1 deletion stringutil/stringutil_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package stringutil_test

import (
"github.com/lithictech/go-aperitif/stringutil"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"strings"
"testing"
Expand Down
2 changes: 1 addition & 1 deletion validator/validator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package validator_test
import (
"errors"
"github.com/lithictech/go-aperitif/validator"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"testing"
"time"
Expand Down

0 comments on commit edf4970

Please sign in to comment.