From a29824aacd09d4a640b935ead622bdaa78b37af3 Mon Sep 17 00:00:00 2001 From: Kwong Tung Nan Date: Fri, 22 Nov 2024 00:31:33 +0800 Subject: [PATCH] Revert "Optimize build processes" This reverts commit dea3db20a0b784dc483c05c4ff5b3419aaff76af. --- .github/workflows/ci-ffi-python.yml | 39 ++++++++++++++++------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci-ffi-python.yml b/.github/workflows/ci-ffi-python.yml index dd7a195..4772c0b 100644 --- a/.github/workflows/ci-ffi-python.yml +++ b/.github/workflows/ci-ffi-python.yml @@ -4,38 +4,29 @@ on: push: branches: pull_request: - branches: - - main + branches: [ main ] jobs: linux-build: - strategy: - matrix: - ARCH: - - "amd64" - - "arm64" - name: Linux Build - ${{ matrix.ARCH }} - runs-on: ubuntu-latest + name: Linux - amd64 + runs-on: ubuntu-latest # TODO try using grafana runners steps: - uses: actions/checkout@v4 - - uses: docker/setup-qemu-action@v3 - - uses: docker/setup-buildx-action@v3 - - name: Build in Docker - run: make wheel/linux/${{ matrix.ARCH }} + run: make wheel/linux/amd64 - uses: actions/upload-artifact@v4 with: - name: "linux_${{ matrix.ARCH }}.whl" + name: "linux.whl" path: pyroscope_ffi/python/dist/* linux-test: strategy: fail-fast: false matrix: - PYTHON_VERSION: ["3.9", "3.10", "3.11", "3.12", "3.13"] - needs: ["linux-build"] + PYTHON_VERSION: [ '3.9', '3.10', '3.11', '3.12', '3.13'] + needs: [ 'linux-build' ] name: Linux Test runs-on: ubuntu-latest env: @@ -51,7 +42,7 @@ jobs: architecture: x64 - uses: actions/download-artifact@v4 with: - name: "linux_amd64.whl" + name: "linux.whl" path: "${{github.workspace}}/python" - run: "cd ${{ github.workspace }}/python && ls -l" @@ -60,6 +51,20 @@ jobs: - run: docker run -d -p4040:4040 grafana/pyroscope - run: python pyroscope_ffi/python/scripts/tests/test.py + linux-arm-build: + name: Linux - arm64 + runs-on: github-hosted-ubuntu-arm64 + steps: + - uses: AutoModality/action-clean@v1 + - uses: actions/checkout@v4 + - name: Build in Docker + run: make wheel/linux/arm64 + + - uses: actions/upload-artifact@v4 + with: + name: "linux-arm.whl" + path: pyroscope_ffi/python/dist/* + sdist-build: name: sdist runs-on: ubuntu-latest