Skip to content

Commit

Permalink
Fix boringssl commit hash in github actions
Browse files Browse the repository at this point in the history
  • Loading branch information
perklet committed Nov 17, 2023
1 parent 1646435 commit e0d67c3
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/build-and-test-make.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,28 @@ on:

env:
NSS_VERSION: nss-3.77
BORING_SSL_COMMIT: 3a667d10e94186fd503966f5638e134fe9fb4080
BORING_SSL_COMMIT: dd5219451c3ce26221762a15d867edf43b463bb2

jobs:
build-and-test:
name: Build curl-impersonate and run the tests
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04, macos-12]
os: [ubuntu-22.04, macos-12]
arch: [x86_64]
include:
- os: ubuntu-20.04
- os: ubuntu-22.04
arch: x86_64
host: x86_64-linux-gnu
capture_interface: eth0
make: make
- os: ubuntu-20.04
- os: ubuntu-22.04
arch: aarch64
host: aarch64-linux-gnu
capture_interface: eth0
make: make
- os: ubuntu-20.04
- os: ubuntu-22.04
arch: arm
host: arm-linux-gnueabihf
capture_interface: eth0
Expand All @@ -49,7 +49,7 @@ jobs:
python-version: '3.10'

- name: Install Ubuntu dependencies
if: matrix.os == 'ubuntu-20.04'
if: matrix.os == 'ubuntu-22.04'
run: |
sudo apt-get update
sudo apt-get install build-essential pkg-config cmake ninja-build curl autoconf automake libtool
Expand All @@ -61,7 +61,7 @@ jobs:
sudo apt-get install tcpdump nghttp2-server libnss3
- name: Install Ubuntu cross-compile dependencies (${{ matrix.arch }})
if: matrix.os == 'ubuntu-20.04' && matrix.arch != 'x86_64'
if: matrix.os == 'ubuntu-22.04' && matrix.arch != 'x86_64'
run: |
sudo apt-get install gcc-${{ matrix.host }} g++-${{ matrix.host }}
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ RUN tar xf ${NSS_VERSION}.tar.gz && \
{{#chrome}}
# BoringSSL doesn't have versions. Choose a commit that is used in a stable
# Chromium version.
ARG BORING_SSL_COMMIT=3a667d10e94186fd503966f5638e134fe9fb4080
ARG BORING_SSL_COMMIT=dd5219451c3ce26221762a15d867edf43b463bb2
RUN curl -L https://github.com/google/boringssl/archive/${BORING_SSL_COMMIT}.zip -o boringssl.zip && \
unzip boringssl && \
mv boringssl-${BORING_SSL_COMMIT} boringssl
Expand Down
2 changes: 1 addition & 1 deletion chrome/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ RUN cd brotli-${BROTLI_VERSION} && \

# BoringSSL doesn't have versions. Choose a commit that is used in a stable
# Chromium version.
ARG BORING_SSL_COMMIT=3a667d10e94186fd503966f5638e134fe9fb4080
ARG BORING_SSL_COMMIT=dd5219451c3ce26221762a15d867edf43b463bb2
RUN curl -L https://github.com/google/boringssl/archive/${BORING_SSL_COMMIT}.zip -o boringssl.zip && \
unzip boringssl && \
mv boringssl-${BORING_SSL_COMMIT} boringssl
Expand Down
2 changes: 1 addition & 1 deletion chrome/Dockerfile.alpine
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ RUN cd brotli-${BROTLI_VERSION} && \

# BoringSSL doesn't have versions. Choose a commit that is used in a stable
# Chromium version.
ARG BORING_SSL_COMMIT=3a667d10e94186fd503966f5638e134fe9fb4080
ARG BORING_SSL_COMMIT=dd5219451c3ce26221762a15d867edf43b463bb2
RUN curl -L https://github.com/google/boringssl/archive/${BORING_SSL_COMMIT}.zip -o boringssl.zip && \
unzip boringssl && \
mv boringssl-${BORING_SSL_COMMIT} boringssl
Expand Down

0 comments on commit e0d67c3

Please sign in to comment.