update for Go 1.18

.circleci/config.yml

@@ -1,5 +1,11 @@
 version: 2.1
 executors:
+  test-go118:
+    docker:
+      - image: "cimg/go:1.18"
+    environment:
+      runrace: true
+      TIMESCALE_FACTOR: 3
   test-go117:
     docker:
       - image: "cimg/go:1.17"
@@ -15,7 +21,7 @@ executors:
 
 jobs:
   "test": &test
-    executor: test-go117
+    executor: test-go118
     steps:
       - checkout
       - run:
@@ -42,14 +48,18 @@ jobs:
       - run:
           name: "Run self integration tests with qlog"
           command: ginkgo -v -randomizeAllSpecs -trace integrationtests/self -- -qlog
+  go118:
+    <<: *test
   go117:
     <<: *test
+    executor: test-go117
   go116:
     <<: *test
     executor: test-go116
 
 workflows:
   workflow:
     jobs:
-      - go116
+      - go118
       - go117
+      - go116

.github/workflows/cross-compile.yml

@@ -4,7 +4,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go: [ "1.16.x", "1.17.x" ]
+        go: [ "1.17.x", "1.18.x" ]
     runs-on: ubuntu-latest
     name: "Cross Compilation (Go ${{matrix.go}})"
     steps:

.github/workflows/go-generate.sh

@@ -20,4 +20,4 @@ go generate ./...
 cd ..
 
 # don't compare fuzzing corpora
-diff --exclude=corpus -ruN orig generated
+diff --exclude=corpus --exclude=.git -ruN orig generated

.github/workflows/go-generate.yml

@@ -6,7 +6,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: "1.17.x"
+          go-version: "1.18.x"
       - name: Install dependencies
         run: go build
       - name: Install code generators

.github/workflows/integration.yml

@@ -5,7 +5,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go: [ "1.16.x", "1.17.x", "1.18.0-rc1" ]
+        go: [ "1.16.x", "1.17.x", "1.18.x" ]
     runs-on: ubuntu-latest
     env:
       DEBUG: false # set this to true to export qlogs and save them as artifacts

.github/workflows/lint.yml

@@ -7,7 +7,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: "1.17.x"
+          go-version: "1.18.x"
       - name: Check that no non-test files import Ginkgo or Gomega
         run: .github/workflows/no_ginkgo.sh
       - name: Check that go.mod is tidied

.github/workflows/unit.yml

@@ -7,7 +7,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ "ubuntu", "windows", "macos" ]
-        go: [ "1.16.x", "1.17.x", "1.18.0-rc1" ]
+        go: [ "1.16.x", "1.17.x", "1.18.x" ]
     runs-on: ${{ matrix.os }}-latest
     name: Unit tests (${{ matrix.os}}, Go ${{ matrix.go }})
     steps:

README.md

@@ -10,7 +10,7 @@ In addition to RFC 9000, it currently implements the [IETF QUIC draft-29](https:
 
 ## Guides
 
-*We currently support Go 1.16.x and Go 1.17.x.*
+*We currently support Go 1.16.x, Go 1.17.x, and Go 1.18.x.*
 
 Running tests:
 

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/marten-seemann/qpack v0.2.1
 	github.com/marten-seemann/qtls-go1-16 v0.1.4
 	github.com/marten-seemann/qtls-go1-17 v0.1.0
-	github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1
+	github.com/marten-seemann/qtls-go1-18 v0.1.0
 	github.com/onsi/ginkgo v1.16.4
 	github.com/onsi/gomega v1.13.0
 	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9

go.sum

@@ -85,8 +85,8 @@ github.com/marten-seemann/qtls-go1-16 v0.1.4 h1:xbHbOGGhrenVtII6Co8akhLEdrawwB2i
 github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
 github.com/marten-seemann/qtls-go1-17 v0.1.0 h1:P9ggrs5xtwiqXv/FHNwntmuLMNq3KaSIG93AtAZ48xk=
 github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
-github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1 h1:EnzzN9fPUkUck/1CuY1FlzBaIYMoiBsdwTNmNGkwUUM=
-github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI=
+github.com/marten-seemann/qtls-go1-18 v0.1.0 h1:gCiNAyl7K4yBBjKkI4LeJjMwIEyCweFoEQFOnRn2MuA=
+github.com/marten-seemann/qtls-go1-18 v0.1.0/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=

integrationtests/gomodvendor/go.mod

@@ -1,6 +1,6 @@
 module test
 
-go 1.15
+go 1.16
 
 // The version doesn't matter here, as we're replacing it with the currently checked out code anyway.
 require github.com/lucas-clemente/quic-go v0.21.0

interop/Dockerfile

@@ -2,9 +2,9 @@ FROM martenseemann/quic-network-simulator-endpoint:latest AS builder
 
 RUN apt-get update && apt-get install -y wget tar git
 
-RUN wget https://dl.google.com/go/go1.17.linux-amd64.tar.gz && \
-  tar xfz go1.17.linux-amd64.tar.gz && \
-  rm go1.17.linux-amd64.tar.gz
+RUN wget https://dl.google.com/go/go1.18.linux-amd64.tar.gz && \
+  tar xfz go1.18.linux-amd64.tar.gz && \
+  rm go1.18.linux-amd64.tar.gz
 
 ENV PATH="/go/bin:${PATH}"