From ee83fd3d08c0d0828fda22d9124635cef95a0f73 Mon Sep 17 00:00:00 2001 From: William Yang Date: Thu, 19 Sep 2024 20:13:00 +0200 Subject: [PATCH 1/2] ci: update release script --- .github/workflows/release.yaml | 11 +++++------ test/quicer_SUITE.erl | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index a61336e4..026644e5 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -111,12 +111,12 @@ jobs: - name: build release if: startsWith(github.ref, 'refs/tags/') run: | - IMAGE=ghcr.io/emqx/emqx-builder/5.3-5:1.15.7-${{ matrix.otp }}-${{ matrix.os }} + IMAGE=ghcr.io/emqx/emqx-builder/5.3-13:1.15.7-${{ matrix.otp }}-${{ matrix.os }} docker run -i --rm -v $(pwd):/wd --workdir /wd --platform=linux/${{ matrix.arch }} \ -e BUILD_RELEASE=1 -e QUIC_TLS=${{ matrix.openssl }} \ $IMAGE bash -euc 'git config --global --add safe.directory /wd; make' - - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 + - uses: actions/upload-artifact@v4 if: startsWith(github.ref, 'refs/tags/') with: name: quicer-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.otp }}-${{ matrix.openssl }} @@ -131,16 +131,15 @@ jobs: - linux if: startsWith(github.ref, 'refs/tags/') steps: - - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7 + - uses: actions/download-artifact@v4 with: pattern: 'quicer-*' path: packages merge-multiple: true - name: Create Release - uses: softprops/action-gh-release@69320dbe05506a9a39fc8ae11030b214ec2d1f87 # v2.0.5 + uses: softprops/action-gh-release@v2 with: name: quicer ${{ github.ref_name }} Released - body: quicer ${{ github.ref_name }} Released files: packages/* - draft: false + draft: true prerelease: false diff --git a/test/quicer_SUITE.erl b/test/quicer_SUITE.erl index d19a7736..a8dd96d9 100644 --- a/test/quicer_SUITE.erl +++ b/test/quicer_SUITE.erl @@ -3097,7 +3097,7 @@ tc_setopt_global_lb_mode_ifip(_Config) -> quicer:close_lib(), {ok, _} = quicer:open_lib(), ?assertEqual( - {ok, 2}, + {ok, ?QUIC_LOAD_BALANCING_SERVER_ID_FIXED}, quicer:getopt(quic_global, load_balacing_mode) ). From e5b6b1578d56643a951a454d16c1d9fd4abb9ac8 Mon Sep 17 00:00:00 2001 From: William Yang Date: Thu, 19 Sep 2024 21:25:22 +0200 Subject: [PATCH 2/2] build: make install exclude msquic shared lib --- build.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 3ad9cd88..bb9b7ada 100755 --- a/build.sh +++ b/build.sh @@ -75,7 +75,10 @@ release() { fi mkdir -p _packages TARGET_PKG="_packages/${PKGNAME}" - tar czvf "$TARGET_PKG" -C $(dirname "$TARGET_SO") --exclude include --exclude share --exclude .gitignore . + tar czvf "$TARGET_PKG" -C $(dirname "$TARGET_SO") \ + --exclude include --exclude share --exclude .gitignore \ + --exclude lib \ + . # use openssl but not sha256sum command because in some macos env it does not exist if command -v openssl; then openssl dgst -sha256 "${TARGET_PKG}" | cut -d ' ' -f 2 > "${TARGET_PKG}.sha256"