Version 2.23.3

This commit is contained in:
Samantaz Fox 2022-08-04 17:49:03 +02:00
parent bb9fad267c
commit eae5041c35
2 changed files with 35 additions and 48 deletions

View File

@ -9,66 +9,54 @@ on:
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: alpine:latest container: alpine:3.14
outputs: outputs:
LSQUIC_COMMIT: ${{ env.LSQUIC_COMMIT }} LSQUIC_COMMIT: ${{ env.LSQUIC_COMMIT }}
LSQUIC_VERSION: ${{ env.LSQUIC_VERSION }} LSQUIC_VERSION: ${{ env.LSQUIC_VERSION }}
steps: steps:
- name: Install action dependencies - name: Install action dependencies
run: apk add git tar run: |
apk add \
binutils \
bsd-compat-headers \
build-base \
cmake \
git \
go \
libevent-dev \
linux-headers \
ninja \
perl \
tar \
zlib-dev \
zlib-static
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Load BORINGSSL_COMMIT and LSQUIC_COMMIT - name: Load BORINGSSL_COMMIT and LSQUIC_COMMIT
run: ./env.sh run: ./env.sh
- name: Cache BoringSSL - name: Cache BoringSSL
id: cache-boringssl id: cache-boringssl
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: ./boringssl path: ./boringssl
key: boringssl-${{ env.BORINGSSL_COMMIT }} key: boringssl-${{ env.BORINGSSL_COMMIT }}
- name: Build BoringSSL - name: Build BoringSSL
if: steps.cache-boringssl.outputs.cache-hit != 'true' if: steps.cache-boringssl.outputs.cache-hit != 'true'
run: | run: |
apk add \
build-base \
cmake \
git \
go \
linux-headers \
ninja \
perl
git clone https://boringssl.googlesource.com/boringssl git clone https://boringssl.googlesource.com/boringssl
cd boringssl cd boringssl
git checkout $BORINGSSL_COMMIT git checkout $BORINGSSL_COMMIT
cmake -DCMAKE_BUILD_TYPE=Release -GNinja . cmake -DCMAKE_BUILD_TYPE=Release -GNinja .
ninja ninja
- name: Cache LSQUIC
id: cache-lsquic
uses: actions/cache@v2
with:
path: ./lsquic
key: lsquic-${{ env.LSQUIC_COMMIT }}-${{ env.BORINGSSL_COMMIT }}
- name: Build LSQUIC - name: Build LSQUIC
if: steps.cache-lsquic.outputs.cache-hit != 'true' if: steps.cache-lsquic.outputs.cache-hit != 'true'
run: | run: |
apk add \
build-base \
bsd-compat-headers \
cmake \
git \
go \
libevent-dev \
linux-headers \
perl \
zlib-dev \
zlib-static
git clone https://github.com/litespeedtech/lsquic.git git clone https://github.com/litespeedtech/lsquic.git
cd lsquic cd lsquic
git checkout $LSQUIC_COMMIT git checkout $LSQUIC_COMMIT
@ -76,23 +64,22 @@ jobs:
git submodule update git submodule update
cmake -DBORINGSSL_DIR=../boringssl . cmake -DBORINGSSL_DIR=../boringssl .
make make
- name: Test LSQUIC - name: Test LSQUIC
if: steps.cache-lsquic.outputs.cache-hit != 'true' if: steps.cache-lsquic.outputs.cache-hit != 'true'
run: | run: |
cd lsquic cd lsquic
make test make test
- name: Set LSQUIC_VERSION - name: Set LSQUIC_VERSION
run: | run: |
cd lsquic cd lsquic
LSQUIC_VERSION=$(git describe --contains $LSQUIC_COMMIT) LSQUIC_VERSION=$(git describe --contains $LSQUIC_COMMIT)
echo "LSQUIC_VERSION=$LSQUIC_VERSION" >> $GITHUB_ENV echo "LSQUIC_VERSION=$LSQUIC_VERSION" >> $GITHUB_ENV
echo "LSQUIC_VERSION=$LSQUIC_VERSION" echo "LSQUIC_VERSION=$LSQUIC_VERSION"
- name: Prepare artifact / release asset - name: Prepare artifact / release asset
run: | run: |
apk add binutils
mkdir dist mkdir dist
cd dist cd dist
ar -x ../boringssl/ssl/libssl.a ar -x ../boringssl/ssl/libssl.a
@ -102,29 +89,29 @@ jobs:
rm *.o rm *.o
strip --strip-unneeded liblsquic.a strip --strip-unneeded liblsquic.a
ranlib liblsquic.a ranlib liblsquic.a
echo "liblsquic.a $LSQUIC_VERSION (https://github.com/litespeedtech/lsquic/commit/$LSQUIC_COMMIT)" > version.txt echo "liblsquic.a $LSQUIC_VERSION (https://github.com/litespeedtech/lsquic/commit/$LSQUIC_COMMIT)" > version.txt
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
with: with:
name: liblsquic.zip name: liblsquic.zip
path: dist/ path: dist/
release: release:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: github.ref == 'refs/heads/master' && github.event_name == 'push' if: github.ref == 'refs/heads/master' && github.event_name == 'push'
needs: build needs: build
env: env:
LSQUIC_VERSION: ${{ needs.build.outputs.LSQUIC_VERSION }} LSQUIC_VERSION: ${{ needs.build.outputs.LSQUIC_VERSION }}
LSQUIC_COMMIT: ${{ needs.build.outputs.LSQUIC_COMMIT }} LSQUIC_COMMIT: ${{ needs.build.outputs.LSQUIC_COMMIT }}
steps: steps:
- uses: actions/download-artifact@v2 - uses: actions/download-artifact@v2
with: with:
name: liblsquic.zip name: liblsquic.zip
- name: Create release - name: Create release
id: create_release id: create_release
uses: actions/create-release@v1 uses: actions/create-release@v1
@ -134,7 +121,7 @@ jobs:
tag_name: ${{ env.LSQUIC_VERSION }} tag_name: ${{ env.LSQUIC_VERSION }}
release_name: ${{ env.LSQUIC_VERSION }} release_name: ${{ env.LSQUIC_VERSION }}
body: liblsquic.a ${{ env.LSQUIC_VERSION }} (https://github.com/litespeedtech/lsquic/commit/${{ env.LSQUIC_COMMIT }}) body: liblsquic.a ${{ env.LSQUIC_VERSION }} (https://github.com/litespeedtech/lsquic/commit/${{ env.LSQUIC_COMMIT }})
- name: Upload release asset - name: Upload release asset
uses: actions/upload-release-asset@v1 uses: actions/upload-release-asset@v1
env: env:

2
env.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
BORINGSSL_COMMIT=b117a3a0b7bd11fe6ebd503ec6b45d6b910b41a1 BORINGSSL_COMMIT=b117a3a0b7bd11fe6ebd503ec6b45d6b910b41a1
LSQUIC_COMMIT=f198a02df8d5629c9f40fff726081aeea0f1681c LSQUIC_COMMIT=078f53798c01037dc57c1313ea128a0583465cba
echo "BORINGSSL_COMMIT=$BORINGSSL_COMMIT" >> $GITHUB_ENV echo "BORINGSSL_COMMIT=$BORINGSSL_COMMIT" >> $GITHUB_ENV
echo "LSQUIC_COMMIT=$LSQUIC_COMMIT" >> $GITHUB_ENV echo "LSQUIC_COMMIT=$LSQUIC_COMMIT" >> $GITHUB_ENV