yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9350 from emqx/revert-9321-av-43-remove-3rdparty-cert-in-packages 

Revert "fix: remove outdated cert store from packages"
This commit is contained in:
Zaiming (Stone) Shi 2022-11-11 14:56:06 +01:00 committed by GitHub
parent 9b01c7f4a9 d5de5ac05c
commit 7317a8aba8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/build_packages.yaml vendored
View File

@ -94,11 +94,6 @@ jobs:
}
make ensure-rebar3
make ${{ matrix.profile }}
## Delete certifi cert store
$Cert = Get-ChildItem "_build/${{ matrix.profile }}/rel/emqx/lib/certifi*/priv/cacerts.pem"
if (Test-Path $Cert) {
Remove-Item $Cert
}
mkdir -p _packages/${{ matrix.profile }}
Compress-Archive -Path _build/${{ matrix.profile }}/rel/emqx -DestinationPath _build/${{ matrix.profile }}/rel/$pkg_name
mv _build/${{ matrix.profile }}/rel/$pkg_name _packages/${{ matrix.profile }}

15
build
View File

@ -61,20 +61,9 @@ log() {
echo "===< $msg"
}
delete_unwanted_file() {
if [ -e "${1}" ]; then
log "Deleting file: ${1}"
rm -f "${1}"
else
log "Cannot delete file: ${1} -- file not found"
fi
}
make_rel() {
./rebar3 as "$PROFILE" release
# delete outdated cert store
delete_unwanted_file _build/"${PROFILE}"/rel/emqx/lib/certifi*/priv/cacerts.pem
./rebar3 as "$PROFILE" tar
# shellcheck disable=SC1010
./rebar3 as "$PROFILE" do release,tar
}
## unzip previous version .zip files to _build/$PROFILE/rel/emqx/releases before making relup