Skip to content

Commit

Permalink
Merge pull request #307 from qzhuyan/dev/william/fix-el9-sys-link
Browse files Browse the repository at this point in the history
build: fix el9 sys link
  • Loading branch information
qzhuyan authored Oct 14, 2024
2 parents 5bf02f7 + 738f069 commit b469ec2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,6 @@ jobs:
- el9
- el8
exclude:
- os: el9
openssl: sys
- os: amzn2
openssl: openssl3
runs-on: ubuntu-latest
Expand All @@ -120,7 +118,7 @@ jobs:
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 QUICER_TLS_VER=${{ matrix.openssl }} \
$IMAGE bash -euc 'git config --global --add safe.directory /wd; [[ "${QUICER_TLS_VER}" == "openssl3" ]] && which yum && yum install -y perl-IPC-Cmd; make'
$IMAGE bash -euc 'git config --global --add safe.directory /wd; which yum && yum install -y perl-IPC-Cmd; make'
- uses: actions/upload-artifact@v4
if: startsWith(github.ref, 'refs/tags/')
Expand Down
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ download() {
# - priv/libquicer_nif.so.504
remove_dups() {
cp -L $TARGET_SO ${TARGET_SO}tmp
rm ${TARGET_SO}.*
rm ${TARGET_SO}-.*
rm -f ${TARGET_SO}.*
rm -f ${TARGET_SO}-.*
mv ${TARGET_SO}tmp $TARGET_SO
}

Expand Down

0 comments on commit b469ec2

Please sign in to comment.