Skip to content

Commit 355cbfc

Browse files
authored
improve build scripts and releases flows (#694)
1 parent 7e63f17 commit 355cbfc

8 files changed

+43
-11
lines changed

.github/workflows/ci_linux_alpine_x86_64_musl_complementary.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ on:
4949
paths:
5050
- '.github/workflows/ci_linux_alpine_x86_64_musl_complementary.yml'
5151
branches: [ main ]
52+
push:
53+
branches:
54+
- 'v[0-9]+.[0-9]+.*'
55+
tags-ignore:
56+
- '**'
5257

5358
permissions:
5459
contents: read

.github/workflows/ci_linux_debian_x86_64_gnu_complementary.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ on:
5555
paths:
5656
- '.github/workflows/ci_linux_debian_x86_64_gnu_complementary.yml'
5757
branches: [ main ]
58+
push:
59+
branches:
60+
- 'v[0-9]+.[0-9]+.*'
61+
tags-ignore:
62+
- '**'
5863

5964
permissions:
6065
contents: read

.github/workflows/ci_linux_ubuntu_aarch64_gnu_complementary.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ on:
5050
paths:
5151
- '.github/workflows/ci_linux_ubuntu_aarch64_gnu_complementary.yml'
5252
branches: [ main ]
53+
push:
54+
branches:
55+
- 'v[0-9]+.[0-9]+.*'
56+
tags-ignore:
57+
- '**'
5358

5459
permissions:
5560
contents: read

.github/workflows/ci_linux_ubuntu_x86_64_gnu_complementary.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ on:
4949
paths:
5050
- '.github/workflows/ci_linux_ubuntu_x86_64_gnu_complementary.yml'
5151
branches: [ main ]
52+
push:
53+
branches:
54+
- 'v[0-9]+.[0-9]+.*'
55+
tags-ignore:
56+
- '**'
5257

5358
permissions:
5459
contents: read

ext/build_linux_aarch64_gnu.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,13 @@ if [ ! -f "$OPENSSL_PREFIX/lib/libssl.a" ] && [ ! -f "$OPENSSL_PREFIX/lib64/libs
7979
./Configure linux-aarch64 \
8080
no-shared \
8181
no-dso \
82-
--prefix="$OPENSSL_PREFIX"
82+
--prefix="$OPENSSL_PREFIX" \
83+
--openssldir="/etc/ssl" \
84+
--with-rand-seed=os \
85+
-DOPENSSL_NO_HEARTBEATS
8386
make clean || true
8487
make -j$(get_cpu_count)
85-
make install
88+
make install_sw
8689
unset CFLAGS
8790
log "OpenSSL built successfully"
8891
else

ext/build_linux_x86_64_gnu.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,13 @@ if [ ! -f "$OPENSSL_PREFIX/lib/libssl.a" ] && [ ! -f "$OPENSSL_PREFIX/lib64/libs
7272
./Configure linux-x86_64 \
7373
no-shared \
7474
no-dso \
75-
--prefix="$OPENSSL_PREFIX"
75+
--prefix="$OPENSSL_PREFIX" \
76+
--openssldir="/etc/ssl" \
77+
--with-rand-seed=os \
78+
-DOPENSSL_NO_HEARTBEATS
7679
make clean || true
7780
make -j$(get_cpu_count)
78-
make install
81+
make install_sw
7982
unset CFLAGS
8083
log "OpenSSL built successfully"
8184
else

ext/build_linux_x86_64_musl.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,15 +166,17 @@ build_openssl_musl() {
166166
no-dso \
167167
no-engine \
168168
--prefix="$openssl_prefix" \
169-
--openssldir="$openssl_prefix/ssl"
169+
--openssldir="/etc/ssl" \
170+
--with-rand-seed=os \
171+
-DOPENSSL_NO_HEARTBEATS
170172

171173
make -j$(get_cpu_count)
172174

173175
# Try the install and capture any errors
174176
log "Installing OpenSSL..."
175-
if ! make install_sw install_ssldirs 2>&1; then
176-
warn "install_sw failed, trying full install..."
177-
make install || {
177+
if ! make install_sw 2>&1; then
178+
warn "install_sw failed, trying again..."
179+
make install_sw || {
178180
# If install fails, check if libraries were actually built
179181
if [ -f "libssl.a" ] && [ -f "libcrypto.a" ]; then
180182
log "Install failed but libraries exist, copying manually..."

ext/build_macos_arm64.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,17 +86,21 @@ build_openssl_macos() {
8686
no-shared \
8787
no-dso \
8888
--prefix="$openssl_prefix" \
89-
--openssldir="$openssl_prefix/ssl"
89+
--openssldir="/etc/ssl" \
90+
--with-rand-seed=os \
91+
-DOPENSSL_NO_HEARTBEATS
9092
else
9193
./Configure darwin64-x86_64-cc \
9294
no-shared \
9395
no-dso \
9496
--prefix="$openssl_prefix" \
95-
--openssldir="$openssl_prefix/ssl"
97+
--openssldir="/etc/ssl" \
98+
--with-rand-seed=os \
99+
-DOPENSSL_NO_HEARTBEATS
96100
fi
97101

98102
make -j$(get_cpu_count)
99-
make install
103+
make install_sw
100104

101105
# Verify the build
102106
if [ ! -f "$openssl_prefix/lib/libssl.a" ] || [ ! -f "$openssl_prefix/lib/libcrypto.a" ]; then

0 commit comments

Comments
 (0)