Skip to content

Commit

Permalink
use Go 1.18 on CI
Browse files Browse the repository at this point in the history
  • Loading branch information
marten-seemann committed Mar 16, 2022
1 parent 36977dd commit 3660971
Show file tree
Hide file tree
Showing 11 changed files with 83 additions and 26 deletions.
14 changes: 12 additions & 2 deletions .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"
Expand All @@ -15,7 +21,7 @@ executors:

jobs:
"test": &test
executor: test-go117
executor: test-go118
steps:
- checkout
- run:
Expand All @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/cross-compile.yml
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/go-generate.sh
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/go-generate.yml
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit.yml
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down
73 changes: 60 additions & 13 deletions integrationtests/gomodvendor/go.sum

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions interop/Dockerfile
Expand Up @@ -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}"

Expand Down

0 comments on commit 3660971

Please sign in to comment.