From 8ecb2f6ee62e7ef7bff4326b6796bd8b33e0ee20 Mon Sep 17 00:00:00 2001 From: psergee Date: Fri, 7 Jun 2024 17:18:47 +0300 Subject: [PATCH] ci/cd: enable aarch64 --- .github/workflows/publish.yml | 15 +++++++++------ .github/workflows/tests.yml | 10 ++++++++-- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index fc4b20f70..ec7c030d7 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -74,7 +74,6 @@ jobs: path: dist create-packages-linux-arm64: - if: false runs-on: graviton strategy: fail-fast: false @@ -173,7 +172,7 @@ jobs: path: dist draft-release: - needs: [create-packages-linux, create-packages-macos] + needs: [create-packages-linux, create-packages-linux-arm64, create-packages-macos] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -189,6 +188,7 @@ jobs: run: | mkdir -p ./dist-prebuilt/packages-linux mkdir -p ./dist-prebuilt/packages-macos + mkdir -p ./dist-prebuilt/packages-linux-arm64 - name: Download linux binaries uses: actions/download-artifact@v3 @@ -197,7 +197,6 @@ jobs: path: ./dist-prebuilt/packages-linux - name: Download linux arm64 binaries - if: false uses: actions/download-artifact@v3 with: name: packages-linux-arm64 @@ -214,11 +213,15 @@ jobs: rm ./dist-prebuilt/packages-linux/artifacts.json rm ./dist-prebuilt/packages-linux/config.yaml rm ./dist-prebuilt/packages-linux/metadata.json + rm ./dist-prebuilt/packages-linux-arm64/artifacts.json + rm ./dist-prebuilt/packages-linux-arm64/config.yaml + rm ./dist-prebuilt/packages-linux-arm64/metadata.json rm ./dist-prebuilt/packages-macos/artifacts.json rm ./dist-prebuilt/packages-macos/config.yaml rm ./dist-prebuilt/packages-macos/metadata.json rm ./dist-prebuilt/packages-macos/tt_darwin_amd64_v1/tt rm ./dist-prebuilt/packages-linux/tt_linux_amd64_v1/tt + rm ./dist-prebuilt/packages-linux-arm64/tt_linux_arm64/tt - name: Pack additional archives run: | @@ -229,8 +232,10 @@ jobs: run: | cd ./dist-prebuilt cat ./packages-linux/tt*checksums.txt >> checksums.txt + cat ./packages-linux-arm64/tt*checksums.txt >> checksums.txt cat ./packages-macos/tt*checksums.txt >> checksums.txt rm ./packages-linux/tt*checksums.txt + rm ./packages-linux-arm64/tt*checksums.txt rm ./packages-macos/tt*checksums.txt mv checksums.txt ./packages-macos/ @@ -252,7 +257,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} publish-s3: - needs: [create-packages-linux] + needs: [create-packages-linux, create-packages-linux-arm64] runs-on: ubuntu-latest if: startsWith(github.ref, 'refs/tags') steps: @@ -282,14 +287,12 @@ jobs: run: mage publishRWS && rm -rf dist - name: Download arm64 packages artifacts - if: false uses: actions/download-artifact@v2 with: name: packages-linux-arm64 path: dist - name: Publish arm64 packages to RWS - if: false env: RWS_URL_PART: https://rws.tarantool.org/release/modules RWS_AUTH: ${{ secrets.RWS_AUTH }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f821285c2..78cab51a7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -50,7 +50,11 @@ jobs: run: mage integration tests-ce-linux-arm64: - if: false + if: | + (github.event_name == 'push') || + (github.event_name == 'pull_request' && + github.event.pull_request.head.repo.owner.login != 'tarantool' && + !contains(github.event.pull_request.labels.*.name, 'full-ci')) runs-on: graviton strategy: fail-fast: false @@ -66,7 +70,9 @@ jobs: - name: Install test requirements run: | pip3 install setuptools==59.5.0 - pip3 install -r test/requirements.txt + # Limiting the number of jobs for building Python-GRPCIO is a workaround for the + # Out Of Memory (OOM) killer on AArch64 runners. + GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS=6 pip3 install -r test/requirements.txt shell: bash - name: Install etcd