Skip to content

Commit

Permalink
Revert "ci: update to Go 1.22.0 (quic-go#4312)"
Browse files Browse the repository at this point in the history
This reverts commit 013949c.
  • Loading branch information
wwqgtxx committed May 18, 2024
1 parent 91fc7ba commit 657bcb1
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 18 deletions.
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
version: 2.1
executors:
test-go122:
test-go121:
docker:
- image: "cimg/go:1.22"
- image: "cimg/go:1.21"
environment:
runrace: true
TIMESCALE_FACTOR: 3

jobs:
"test": &test
executor: test-go122
executor: test-go121
steps:
- checkout
- run:
Expand All @@ -33,10 +33,10 @@ jobs:
- run:
name: "Run version negotiation tests with qlog"
command: go run github.com/onsi/ginkgo/v2/ginkgo -v -randomize-all -trace integrationtests/versionnegotiation -- -qlog
go122:
go121:
<<: *test

workflows:
workflow:
jobs:
- go122
- go121
2 changes: 1 addition & 1 deletion .clusterfuzzlite/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM gcr.io/oss-fuzz-base/base-builder-go:v1
ARG TARGETPLATFORM
RUN echo "TARGETPLATFORM: ${TARGETPLATFORM}"

ENV GOVERSION=1.22.0
ENV GOVERSION=1.21.5

RUN platform=$(echo ${TARGETPLATFORM} | tr '/' '-') && \
filename="go${GOVERSION}.${platform}.tar.gz" && \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cross-compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
strategy:
fail-fast: false
matrix:
go: [ "1.21.x", "1.22.x" ]
go: [ "1.21.x", "1.22.0-rc.2" ]
runs-on: ${{ fromJSON(vars['CROSS_COMPILE_RUNNER_UBUNTU'] || '"ubuntu-latest"') }}
name: "Cross Compilation (Go ${{matrix.go}})"
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
fail-fast: false
matrix:
os: [ "ubuntu" ]
go: [ "1.21.x", "1.22.x" ]
go: [ "1.21.x", "1.22.0-rc.2" ]
include:
- os: "windows"
go: "1.21.x"
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.22.x"
go-version: "1.21.x"
- name: Check that no non-test files import Ginkgo or Gomega
run: .github/workflows/no_ginkgo.sh
- name: Check for //go:build ignore in .go files
Expand Down Expand Up @@ -38,9 +38,7 @@ jobs:
strategy:
fail-fast: false
matrix:
go: [ "1.21.x", "1.22.x" ]
env:
GOLANGCI_LINT_VERSION: v1.56.1
go: [ "1.21.x", "1.22.0-rc.2" ]
name: golangci-lint (Go ${{ matrix.go }})
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
fail-fast: false
matrix:
os: [ "ubuntu", "windows", "macos" ]
go: [ "1.21.x", "1.22.x" ]
go: [ "1.21.x", "1.22.0-rc.2" ]
runs-on: ${{ fromJSON(vars[format('UNIT_RUNNER_{0}', matrix.os)] || format('"{0}-latest"', matrix.os)) }}
name: Unit tests (${{ matrix.os}}, Go ${{ matrix.go }})
steps:
Expand Down
2 changes: 2 additions & 0 deletions internal/qtls/client_session_cache.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
//go:build go1.21

package qtls

import (
Expand Down
2 changes: 1 addition & 1 deletion internal/qtls/go121_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
. "github.com/onsi/gomega"
)

var _ = Describe("interface go crypto/tls", func() {
var _ = Describe("Go 1.21", func() {
It("converts to tls.EncryptionLevel", func() {
Expect(ToTLSEncryptionLevel(protocol.EncryptionInitial)).To(Equal(tls.QUICEncryptionLevelInitial))
Expect(ToTLSEncryptionLevel(protocol.EncryptionHandshake)).To(Equal(tls.QUICEncryptionLevelHandshake))
Expand Down
2 changes: 1 addition & 1 deletion interop/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RUN echo "TARGETPLATFORM: ${TARGETPLATFORM}"

RUN apt-get update && apt-get install -y wget tar git

ENV GOVERSION=1.22.0
ENV GOVERSION=1.21.4

RUN platform=$(echo ${TARGETPLATFORM} | tr '/' '-') && \
filename="go${GOVERSION}.${platform}.tar.gz" && \
Expand Down
6 changes: 3 additions & 3 deletions oss-fuzz.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
# Install Go manually, since oss-fuzz ships with an outdated Go version.
# See https://github.com/google/oss-fuzz/pull/10643.
export CXX="${CXX} -lresolv" # required by Go 1.20
wget https://go.dev/dl/go1.22.0.linux-amd64.tar.gz \
wget https://go.dev/dl/go1.21.5.linux-amd64.tar.gz \
&& mkdir temp-go \
&& rm -rf /root/.go/* \
&& tar -C temp-go/ -xzf go1.22.0.linux-amd64.tar.gz \
&& tar -C temp-go/ -xzf go1.21.5.linux-amd64.tar.gz \
&& mv temp-go/go/* /root/.go/ \
&& rm -rf temp-go go1.22.0.linux-amd64.tar.gz
&& rm -rf temp-go go1.21.5.linux-amd64.tar.gz

(
# fuzz qpack
Expand Down

0 comments on commit 657bcb1

Please sign in to comment.