Skip to content

Commit

Permalink
release openssl vars (#218)
Browse files Browse the repository at this point in the history
* ci: releases with openssl3

* fix(build): conditionally enable numa aware

* ci: release macos
  • Loading branch information
qzhuyan authored Sep 19, 2023
1 parent c7c75fe commit 7fe30c7
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 3 deletions.
14 changes: 13 additions & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,16 @@ jobs:
matrix:
otp:
- 25.3.2-1
openssl:
- openssl3
- openssl
os:
- macos-12
- macos-11
- macos-12-arm64
runs-on: ${{ matrix.os }}
steps:

- uses: emqx/[email protected]
with:
os: ${{ matrix.os }}
Expand All @@ -30,7 +34,10 @@ jobs:

- name: build release
if: startsWith(github.ref, 'refs/tags/')
env:
QUIC_TLS: ${{ matrix.openssl }}
run: |
export QUIC_TLS
BUILD_RELEASE=1 make
- uses: actions/upload-artifact@v3
Expand All @@ -49,6 +56,9 @@ jobs:
- 5.1-3
otp:
- 25.3.2-1
openssl:
- openssl3
- openssl
elixir:
- 1.14.5
arch:
Expand Down Expand Up @@ -90,7 +100,9 @@ jobs:
if: startsWith(github.ref, 'refs/tags/')
run: |
IMAGE=ghcr.io/emqx/emqx-builder/${{ matrix.builder }}:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}
docker run -i --rm -v $(pwd):/wd --workdir /wd --platform=linux/${{ matrix.arch }} -e BUILD_RELEASE=1 $IMAGE bash -euc 'git config --global --add safe.directory /wd; make'
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@v3
if: startsWith(github.ref, 'refs/tags/')
Expand Down
7 changes: 6 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,12 @@ add_library(quicer_static STATIC ${SOURCES})
target_include_directories(quicer_static PRIVATE ${Erlang_OTP_ROOT_DIR}/usr/include/ msquic/src/inc/)
if (CMAKE_SYSTEM_NAME MATCHES Linux)
# note, the value of ${ATOMIC} and %{NUMA} will be set by msquic
target_link_libraries(quicer_static PRIVATE core platform inc warnings logging ${ATOMIC} ${NUMA} "-Wl,--no-gc-sections")
if (NUMA)
set(MY_NUMA ${NUMA})
else()
set(MY_NUMA "")
endif()
target_link_libraries(quicer_static PRIVATE core platform inc warnings logging ${ATOMIC} ${MY_NUMA} "-Wl,--no-gc-sections")
elseif (CMAKE_SYSTEM_NAME MATCHES Darwin)
target_link_libraries(quicer_static PRIVATE core platform inc warnings "-Wl,-undefined,dynamic_lookup -Wl,-dead_strip")
endif()
Expand Down
4 changes: 3 additions & 1 deletion pkgname.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,12 @@ esac
ARCH="$(uname -m)"
VSN="$(git describe --tags --exact-match | head -1)"

OPENSSL=${QUIC_TLS:-openssl}

if [ -z "$VSN" ]; then
exit 0
fi

OTP="$(erl -noshell -eval 'io:format(erlang:system_info(otp_release)).' -s init stop)"

echo "libquicer-${VSN}-otp${OTP}-${SYSTEM}-${ARCH}.gz"
echo "libquicer-${VSN}-otp${OTP}-${OPENSSL}-${SYSTEM}-${ARCH}.gz"

0 comments on commit 7fe30c7

Please sign in to comment.