File tree 4 files changed +25
-18
lines changed
4 files changed +25
-18
lines changed Original file line number Diff line number Diff line change 93
93
openssl :
94
94
- openssl3
95
95
- openssl
96
+ - sys
96
97
rebar3 :
97
98
- 3.23.0
98
99
build_type :
@@ -115,15 +116,15 @@ jobs:
115
116
- name : release build with debug log off
116
117
env :
117
118
CMAKE_BUILD_TYPE : ${{ matrix.build_type }}
118
- QUIC_TLS : ${{ matrix.openssl }}
119
+ QUICER_TLS_VER : ${{ matrix.openssl }}
119
120
QUIC_ENABLE_LOGGING : ${{ matrix.logging }}
120
121
run : |
121
122
echo "github ref: ${{ github.event.ref }}"
122
123
echo "github ref: ${{ github.ref }}"
123
124
sudo sysctl -w kernel.core_pattern=core
124
125
ulimit -c unlimited
125
126
export CMAKE_BUILD_TYPE
126
- export QUIC_TLS
127
+ export QUICER_TLS_VER
127
128
export QUIC_ENABLE_LOGGING
128
129
if [ "${QUIC_ENABLE_LOGGING}" == "ON" ] ; then
129
130
export QUIC_LOGGING_TYPE=lttng
Original file line number Diff line number Diff line change @@ -49,12 +49,12 @@ jobs:
49
49
- name : build release
50
50
if : startsWith(github.ref, 'refs/tags/')
51
51
env :
52
- QUIC_TLS : ${{ matrix.openssl }}
52
+ QUICER_TLS_VER : ${{ matrix.openssl }}
53
53
run : |
54
54
wget https://s3.amazonaws.com/rebar3/rebar3 && chmod +x rebar3
55
55
sudo mv rebar3 /usr/local/bin/ && sudo chmod +x /usr/local/bin/rebar3
56
56
erl -eval 'erlang:display(erlang:system_info(system_version)),halt()'
57
- export QUIC_TLS
57
+ export QUICER_TLS_VER
58
58
BUILD_RELEASE=1 make
59
59
60
60
- uses : actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
65
65
_packages/*.gz
66
66
_packages/*.gz.sha256
67
67
68
- linux :
68
+ emqx- linux :
69
69
strategy :
70
70
fail-fast : false
71
71
matrix :
75
75
openssl :
76
76
- openssl3
77
77
- openssl
78
+ - sys
78
79
arch :
79
80
- amd64
80
81
- arm64
90
91
- amzn2
91
92
- el9
92
93
- el8
94
+ exclude :
95
+ - os : el9
96
+ openssl : sys
93
97
runs-on : ubuntu-latest
94
98
95
99
steps :
@@ -113,7 +117,7 @@ jobs:
113
117
run : |
114
118
IMAGE=ghcr.io/emqx/emqx-builder/5.3-13:1.15.7-${{ matrix.otp }}-${{ matrix.os }}
115
119
docker run -i --rm -v $(pwd):/wd --workdir /wd --platform=linux/${{ matrix.arch }} \
116
- -e BUILD_RELEASE=1 -e QUIC_TLS =${{ matrix.openssl }} \
120
+ -e BUILD_RELEASE=1 -e QUICER_TLS_VER =${{ matrix.openssl }} \
117
121
$IMAGE bash -euc 'git config --global --add safe.directory /wd; make'
118
122
119
123
- uses : actions/upload-artifact@v4
@@ -128,7 +132,7 @@ jobs:
128
132
runs-on : ubuntu-latest
129
133
needs :
130
134
- mac
131
- - linux
135
+ - emqx- linux
132
136
if : startsWith(github.ref, 'refs/tags/')
133
137
steps :
134
138
- uses : actions/download-artifact@v4
Original file line number Diff line number Diff line change @@ -35,18 +35,20 @@ else()
35
35
set (CMAKE_BUILD_TYPE "RelWithDebInfo" )
36
36
endif ()
37
37
38
- if (DEFINED ENV{QUIC_USE_SYSTEM_LIBCRYPTO})
39
- find_package (OpenSSL REQUIRED)
40
- if ("${OPENSSL_VERSION} " MATCHES "3.*" )
41
- set (QUIC_TLS openssl3)
38
+ if (DEFINED ENV{QUICER_TLS_VER})
39
+ if ($ENV{QUICER_TLS_VER} STREQUAL "sys" )
40
+ ## Link to sys libcrypto, auto openssl vsn
41
+ find_package (OpenSSL REQUIRED)
42
+ if ("${OPENSSL_VERSION} " MATCHES "3.*" )
43
+ set (QUIC_TLS "openssl3" CACHE STRING "QUIC_TLS" )
44
+ else ()
45
+ set (QUIC_TLS "openssl" CACHE STRING "QUIC_TLS" )
46
+ endif ()
47
+ set (QUIC_USE_SYSTEM_LIBCRYPTO "ON" )
42
48
else ()
43
- set (QUIC_TLS openssl)
44
- endif ()
45
- set (QUIC_USE_SYSTEM_LIBCRYPTO "ON" )
46
- else ()
47
- if (DEFINED ENV{QUIC_TLS})
48
- set (QUIC_TLS $ENV{QUIC_TLS} )
49
+ set (QUIC_TLS $ENV{QUICER_TLS_VER} )
49
50
endif ()
51
+
50
52
endif ()
51
53
52
54
if (DEFINED ENV{QUIC_ENABLE_LOGGING})
Original file line number Diff line number Diff line change 29
29
ARCH=" $( uname -m) "
30
30
VSN=" $( git describe --tags --exact-match | head -1) "
31
31
32
- OPENSSL=${QUIC_TLS :- openssl}
32
+ OPENSSL=${QUICER_TLS_VER :- openssl}
33
33
34
34
if [ -z " $VSN " ]; then
35
35
exit 0
You can’t perform that action at this time.
0 commit comments