From be20082ce505b0a88d78a82d0b07a653512adfd2 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Fri, 16 Dec 2022 10:50:38 +0100 Subject: [PATCH 1/2] ci: revert of docker/setup-qemu-action@v3 back to v2 --- .github/workflows/build_packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index 55f6dac87..8167ca602 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -225,7 +225,7 @@ jobs: path: . - name: unzip source code run: unzip -q source.zip - - uses: docker/setup-qemu-action@v3 + - uses: docker/setup-qemu-action@v2 with: image: tonistiigi/binfmt:latest platforms: all From 3698150fc5dbbd6ff49a82e28855f6049a2dc74c Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Fri, 16 Dec 2022 11:01:00 +0100 Subject: [PATCH 2/2] ci: use alternatives for python2 python3 switch --- .ci/build_packages/tests.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.ci/build_packages/tests.sh b/.ci/build_packages/tests.sh index a51885c1e..3182cd414 100755 --- a/.ci/build_packages/tests.sh +++ b/.ci/build_packages/tests.sh @@ -116,7 +116,20 @@ emqx_test(){ fi ;; "rpm") - yum install -y "${PACKAGE_PATH}/${packagename}" + # yum wants python2 + if [[ "${SYSTEM:-}" == "amzn2" ]]; then + alternatives --list | grep python && alternatives --set python /usr/bin/python2 + fi + YUM_RES="$(yum install -y "${PACKAGE_PATH}/${packagename}"| tee /dev/null)" + if [[ $YUM_RES =~ "Failed" ]]; then + echo "yum install failed" + exit 1 + fi + # restore python3 + if [[ "${SYSTEM:-}" == "amzn2" ]]; then + alternatives --list | grep python && alternatives --set python /usr/bin/python3 + fi + if ! rpm -q "${PROFILE}" | grep -q "${PROFILE}"; then echo "package install error" exit 1