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
nekohasekai committed May 15, 2024
1 parent 3268e07 commit 200febf
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
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: 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
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 200febf

Please sign in to comment.