Skip to content

Commit 74003b4

Browse files
authored
fix: improve python tests speed (#76)
1 parent 3ce4096 commit 74003b4

File tree

2 files changed

+219
-149
lines changed

2 files changed

+219
-149
lines changed

.github/workflows/ci-ffi-python.yml

Lines changed: 89 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,15 @@ jobs:
5151
strategy:
5252
fail-fast: false
5353
matrix:
54-
PYROSCOPE_DETECT_SUBPROCESSES: [1, 0]
55-
PYROSCOPE_ONCPU: [1, 0]
56-
PYROSCOPE_GIL_ONLY: [1, 0]
57-
PYROSCOPE_NATIVE: [1, 0]
5854
PYTHON_VERSION: ['2.7', '3.7', '3.8', '3.9', '3.10']
5955
needs: ['linux-build']
6056
name: Linux Test
6157
runs-on: ubuntu-latest
58+
env:
59+
PYROSCOPE_RUN_ID: ${{ github.run_id }}
60+
PYROSCOPE_ARCH: x86-64-linux
61+
PYROSCOPE_API_TOKEN: ${{ secrets.PYROSCOPE_API_TOKEN }}
62+
PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
6263
steps:
6364
- name: Set up Python
6465
uses: actions/setup-python@v4
@@ -75,17 +76,7 @@ jobs:
7576
- uses: actions/checkout@v2
7677
with:
7778
submodules: recursive
78-
- name: Run Python Script
79-
run: python pyroscope_ffi/python/scripts/tests/test.py
80-
env:
81-
PYROSCOPE_RUN_ID: ${{ github.run_id }}
82-
PYROSCOPE_ARCH: x86-64-linux
83-
PYROSCOPE_API_TOKEN: ${{ secrets.PYROSCOPE_API_TOKEN }}
84-
PYROSCOPE_DETECT_SUBPROCESSES: ${{ matrix.PYROSCOPE_DETECT_SUBPROCESSES }}
85-
PYROSCOPE_ONCPU: ${{ matrix.PYROSCOPE_ONCPU }}
86-
PYROSCOPE_GIL_ONLY: ${{ matrix.PYROSCOPE_GIL_ONLY }}
87-
PYROSCOPE_NATIVE: ${{ matrix.PYROSCOPE_NATIVE }}
88-
PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
79+
- run: python pyroscope_ffi/python/scripts/tests/test.py
8980

9081
linux-arm-build:
9182
strategy:
@@ -160,14 +151,15 @@ jobs:
160151
strategy:
161152
fail-fast: false
162153
matrix:
163-
PYROSCOPE_DETECT_SUBPROCESSES: [1, 0]
164-
PYROSCOPE_ONCPU: [1, 0]
165-
PYROSCOPE_GIL_ONLY: [1, 0]
166-
PYROSCOPE_NATIVE: [1, 0]
167154
PYTHON_VERSION: ['2.7', '3.7', '3.8', '3.9', '3.10']
168155
needs: ['macos-build']
169156
name: Macos Test
170-
runs-on: macos-11.0
157+
runs-on: macos-11.0
158+
env:
159+
PYROSCOPE_RUN_ID: ${{ github.run_id }}
160+
PYROSCOPE_ARCH: x86-64-apple-darwin
161+
PYROSCOPE_API_TOKEN: ${{ secrets.PYROSCOPE_API_TOKEN }}
162+
PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
171163
steps:
172164
- name: Set up Python
173165
uses: actions/setup-python@v4
@@ -188,102 +180,84 @@ jobs:
188180
- uses: actions/checkout@v2
189181
with:
190182
submodules: recursive
191-
- name: Run Python Script
192-
run: python pyroscope_ffi/python/scripts/tests/test.py
193-
env:
194-
PYROSCOPE_RUN_ID: ${{ github.run_id }}
195-
PYROSCOPE_ARCH: x86-64-apple-darwin
196-
PYROSCOPE_API_TOKEN: ${{ secrets.PYROSCOPE_API_TOKEN }}
197-
PYROSCOPE_DETECT_SUBPROCESSES: ${{ matrix.PYROSCOPE_DETECT_SUBPROCESSES }}
198-
PYROSCOPE_ONCPU: ${{ matrix.PYROSCOPE_ONCPU }}
199-
PYROSCOPE_GIL_ONLY: ${{ matrix.PYROSCOPE_GIL_ONLY }}
200-
PYROSCOPE_NATIVE: ${{ matrix.PYROSCOPE_NATIVE }}
201-
PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
202-
203-
204-
windows-build:
205-
strategy:
206-
fail-fast: false
207-
matrix:
208-
include:
209-
- windows-version: "2022"
210-
target: x86_64-pc-windows-gnu
211-
py-platform: win_amd64
212-
213-
name: windows - ${{ matrix.py-platform }}
214-
runs-on: windows-${{ matrix.windows-version }}
215-
216-
steps:
217-
- uses: actions/checkout@v2
218-
219-
- uses: actions-rs/toolchain@v1
220-
with:
221-
toolchain: stable
222-
target: ${{ matrix.target }}
223-
profile: minimal
224-
override: true
225-
226-
- uses: actions/setup-python@v2
227-
with:
228-
python-version: 3.9
229-
230-
231-
- name: Build Wheel
232-
run: |
233-
pip install wheel
234-
python3 setup.py bdist_wheel -p ${{ matrix.py-platform }}
235-
working-directory: pyroscope_ffi/python
236-
env:
237-
CARGO_BUILD_TARGET: ${{ matrix.target }}
238-
239-
- uses: actions/upload-artifact@v2
240-
with:
241-
name: ${{ matrix.target }}
242-
path: pyroscope_ffi/python/dist/*
243-
244-
windows-test:
245-
strategy:
246-
fail-fast: false
247-
matrix:
248-
PYROSCOPE_DETECT_SUBPROCESSES: [1, 0]
249-
PYROSCOPE_ONCPU: [1, 0]
250-
PYROSCOPE_GIL_ONLY: [1, 0]
251-
PYROSCOPE_NATIVE: [1, 0]
252-
PYTHON_VERSION: ['2.7', '3.7', '3.8', '3.9', '3.10']
253-
needs: ['windows-build']
254-
name: Windows Test
255-
runs-on: windows-2022
256-
steps:
257-
- name: Set up Python
258-
uses: actions/setup-python@v4
259-
with:
260-
python-version: ${{ matrix.PYTHON_VERSION }}
261-
architecture: x64
262-
- uses: actions/download-artifact@master
263-
with:
264-
name: x86_64-pc-windows-gnu
265-
path: "${{github.workspace}}/python"
183+
- run: python pyroscope_ffi/python/scripts/tests/test.py
184+
185+
186+
# windows-build:
187+
# strategy:
188+
# fail-fast: false
189+
# matrix:
190+
# include:
191+
# - windows-version: "2022"
192+
# target: x86_64-pc-windows-gnu
193+
# py-platform: win_amd64
194+
#
195+
# name: windows - ${{ matrix.py-platform }}
196+
# runs-on: windows-${{ matrix.windows-version }}
197+
#
198+
# steps:
199+
# - uses: actions/checkout@v2
200+
#
201+
# - uses: actions-rs/toolchain@v1
202+
# with:
203+
# toolchain: stable
204+
# target: ${{ matrix.target }}
205+
# profile: minimal
206+
# override: true
207+
#
208+
# - uses: actions/setup-python@v2
209+
# with:
210+
# python-version: 3.9
211+
#
212+
#
213+
# - name: Build Wheel
214+
# run: |
215+
# pip install wheel
216+
# python3 setup.py bdist_wheel -p ${{ matrix.py-platform }}
217+
# working-directory: pyroscope_ffi/python
218+
# env:
219+
# CARGO_BUILD_TARGET: ${{ matrix.target }}
220+
#
221+
# - uses: actions/upload-artifact@v2
222+
# with:
223+
# name: ${{ matrix.target }}
224+
# path: pyroscope_ffi/python/dist/*
225+
#
226+
# windows-test:
227+
# strategy:
228+
# fail-fast: false
229+
# matrix:
230+
# PYTHON_VERSION: ['2.7', '3.7', '3.8', '3.9', '3.10']
231+
# needs: ['windows-build']
232+
# name: Windows Test
233+
# runs-on: windows-2022
234+
# env:
235+
# PYROSCOPE_RUN_ID: ${{ github.run_id }}
236+
# PYROSCOPE_ARCH: x86_64-pc-windows-gnu
237+
# PYROSCOPE_API_TOKEN: ${{ secrets.PYROSCOPE_API_TOKEN }}
238+
# PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
239+
# steps:
240+
# - name: Set up Python
241+
# uses: actions/setup-python@v4
242+
# with:
243+
# python-version: ${{ matrix.PYTHON_VERSION }}
244+
# architecture: x64
245+
# - uses: actions/download-artifact@master
246+
# with:
247+
# name: x86_64-pc-windows-gnu
248+
# path: "${{github.workspace}}/python"
249+
#
250+
# - run: "python --version"
251+
# - run: "python3 --version"
252+
# - run: "cd ${{ github.workspace }}/python && ls"
253+
# - run: |
254+
# cd ${{ github.workspace }}/python
255+
# foreach($file in Get-ChildItem -Filter *.whl){pip install $file}
256+
# - uses: actions/checkout@v2
257+
# with:
258+
# submodules: recursive
259+
# - run: python pyroscope_ffi/python/scripts/tests/test.py
266260

267-
- run: "python --version"
268-
- run: "python3 --version"
269-
- run: "cd ${{ github.workspace }}/python && ls"
270-
- run: |
271-
cd ${{ github.workspace }}/python
272-
foreach($file in Get-ChildItem -Filter *.whl){pip install $file}
273-
- uses: actions/checkout@v2
274-
with:
275-
submodules: recursive
276-
- name: Run Python Script
277-
run: pyroscope_ffi/python/scripts/tests/test.py
278-
env:
279-
PYROSCOPE_RUN_ID: ${{ github.run_id }}
280-
PYROSCOPE_ARCH: x86_64-pc-windows-gnu
281-
PYROSCOPE_API_TOKEN: ${{ secrets.PYROSCOPE_API_TOKEN }}
282-
PYROSCOPE_DETECT_SUBPROCESSES: ${{ matrix.PYROSCOPE_DETECT_SUBPROCESSES }}
283-
PYROSCOPE_ONCPU: ${{ matrix.PYROSCOPE_ONCPU }}
284-
PYROSCOPE_GIL_ONLY: ${{ matrix.PYROSCOPE_GIL_ONLY }}
285-
PYROSCOPE_NATIVE: ${{ matrix.PYROSCOPE_NATIVE }}
286-
PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
287261
sdist-build:
288262
name: sdist
289263
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)