Skip to content

Commit

Permalink
Fix nghttp2 version and CI
Browse files Browse the repository at this point in the history
  • Loading branch information
perkfly committed Sep 24, 2024
1 parent 64b674c commit cc0c4a5
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build-and-test-make.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ jobs:
host: aarch64-linux-musl
capture_interface: eth0
zigflags: -target aarch64-linux-musl -fPIC -mno-outline-atomics
- arch: i386
host: i386-linux-musl
capture_interface: eth0
zigflags: -target i386-linux-musl -fPIC -mno-outline-atomics
# - arch: i386
# host: i386-linux-musl
# capture_interface: eth0
# zigflags: -target i386-linux-musl -fPIC -mno-outline-atomics
- arch: arm
host: arm-linux-gnueabihf
capture_interface: eth0
Expand Down
4 changes: 2 additions & 2 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ BROTLI_VERSION := 1.1.0
# In case this is changed, update build-and-test-make.yml as well
# In case this is changed, update build-and-test-make.yml as well
BORING_SSL_COMMIT := d24a38200fef19150eef00cad35b138936c08767
NGHTTP2_VERSION := nghttp2-1.64.0
NGHTTP2_URL := https://github.com/nghttp2/nghttp2/releases/download/v1.64.0/nghttp2-1.64.0.tar.bz2
NGHTTP2_VERSION := nghttp2-1.63.0
NGHTTP2_URL := https://github.com/nghttp2/nghttp2/releases/download/v1.63.0/nghttp2-1.63.0.tar.bz2
CURL_VERSION := curl-8_7_1

# https://github.com/google/brotli/commit/641bec0e30bea648b3da1cd90fc6b44deb429f71
Expand Down
4 changes: 2 additions & 2 deletions docker/alpine.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ RUN mkdir boringssl/build/lib && \
ln -s ../ssl/libssl.a boringssl/build/lib/libssl.a && \
cp -R boringssl/include boringssl/build

ARG NGHTTP2_VERSION=nghttp2-1.64.0
ARG NGHTTP2_URL=https://github.com/nghttp2/nghttp2/releases/download/v1.64.0/nghttp2-1.64.0.tar.bz2
ARG NGHTTP2_VERSION=nghttp2-1.63.0
ARG NGHTTP2_URL=https://github.com/nghttp2/nghttp2/releases/download/v1.63.0/nghttp2-1.63.0.tar.bz2

# Download nghttp2 for HTTP/2.0 support.
RUN curl -o ${NGHTTP2_VERSION}.tar.bz2 -L ${NGHTTP2_URL}
Expand Down
4 changes: 2 additions & 2 deletions docker/debian.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ RUN mkdir boringssl/build/lib && \
ln -s ../ssl/libssl.a boringssl/build/lib/libssl.a && \
cp -R boringssl/include boringssl/build

ARG NGHTTP2_VERSION=nghttp2-1.64.0
ARG NGHTTP2_URL=https://github.com/nghttp2/nghttp2/releases/download/v1.64.0/nghttp2-1.64.0.tar.bz2
ARG NGHTTP2_VERSION=nghttp2-1.63.0
ARG NGHTTP2_URL=https://github.com/nghttp2/nghttp2/releases/download/v1.63.0/nghttp2-1.63.0.tar.bz2

# Download nghttp2 for HTTP/2.0 support.
RUN curl -o ${NGHTTP2_VERSION}.tar.bz2 -L ${NGHTTP2_URL}
Expand Down
4 changes: 2 additions & 2 deletions docker/dockerfile.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ RUN mkdir boringssl/build/lib && \
ln -s ../ssl/libssl.a boringssl/build/lib/libssl.a && \
cp -R boringssl/include boringssl/build

ARG NGHTTP2_VERSION=nghttp2-1.64.0
ARG NGHTTP2_URL=https://github.com/nghttp2/nghttp2/releases/download/v1.64.0/nghttp2-1.64.0.tar.bz2
ARG NGHTTP2_VERSION=nghttp2-1.63.0
ARG NGHTTP2_URL=https://github.com/nghttp2/nghttp2/releases/download/v1.63.0/nghttp2-1.63.0.tar.bz2

# Download nghttp2 for HTTP/2.0 support.
RUN curl -o ${NGHTTP2_VERSION}.tar.bz2 -L ${NGHTTP2_URL}
Expand Down

0 comments on commit cc0c4a5

Please sign in to comment.