From f462cd23c35c60dc7afc62c5b8c30ef83fa8cda4 Mon Sep 17 00:00:00 2001 From: AlinsRan Date: Tue, 30 Jan 2024 18:31:21 +0800 Subject: [PATCH] set ssh --- .github/workflows/publish-arm.yml | 11 ++++++++--- utils/build-common.sh | 6 +++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish-arm.yml b/.github/workflows/publish-arm.yml index 1f6c4c07d..329ccd6e0 100644 --- a/.github/workflows/publish-arm.yml +++ b/.github/workflows/publish-arm.yml @@ -1,4 +1,4 @@ -name: Build and Publish RPM Package +name: Build and Publish RPM Package ARM on: push: @@ -10,7 +10,7 @@ concurrency: jobs: publish_apisix: name: Build and Publish RPM Package - runs-on: buildjet-2vcpu-ubuntu-2204-arm + runs-on: ubuntu-20.04 timeout-minutes: 180 env: VAR_COS_BUCKET_CI: ${{ secrets.VAR_COS_BUCKET_CI }} @@ -58,7 +58,8 @@ jobs: run: | wget https://raw.githubusercontent.com/apache/apisix/${APISIX_TAG_VERSION}/.requirements source .requirements - + + exit 1 # build apisix make package type=rpm app=apisix openresty=apisix-runtime runtime_version=${APISIX_RUNTIME} checkout=${APISIX_TAG_VERSION} version=${APISIX_TAG_VERSION} image_base=centos image_tag=7 make package type=rpm app=apisix openresty=apisix-runtime runtime_version=${APISIX_RUNTIME} checkout=${APISIX_TAG_VERSION} version=${APISIX_TAG_VERSION} image_base=centos image_tag=8 @@ -204,3 +205,7 @@ jobs: sudo -E ./utils/publish-rpm.sh repo_repodata_rebuild sudo -E ./utils/publish-rpm.sh repo_upload + - name: Run debugger + if: ${{ failure() }} + uses: mxschmitt/action-tmate@v3 + timeout-minutes: 15 \ No newline at end of file diff --git a/utils/build-common.sh b/utils/build-common.sh index affeccbcc..fcee9116c 100755 --- a/utils/build-common.sh +++ b/utils/build-common.sh @@ -71,10 +71,14 @@ build_apisix_base_apk() { build_apisix_runtime_rpm() { if [[ $(rpm --eval '%{centos_ver}') == "7" ]]; then yum -y install centos-release-scl - yum -y install devtoolset-9 patch wget git make sudo cpanminus + yum -y install devtoolset-9 patch wget git make sudo cpanminus curl set +eu source scl_source enable devtoolset-9 set -eu + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y + source "$HOME/.cargo/env" + rustup install 1.69 + rustup default 1.69 elif [[ $(rpm --eval '%{centos_ver}') == "8" ]]; then dnf install -y gcc-toolset-9-toolchain patch wget git make sudo cpanminus dnf install -y yum-utils