Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/build-test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,11 @@ jobs:
- name: Extract resources from gProfiler executable
run: sudo ./output/gprofiler_x86_64 extract-resources --resources-dest=./gprofiler/resources

- name: Clean Docker resources
run: |
docker system prune -f --volumes
df -h

# used in the tests
- name: Import gProfiler image
run: docker image load < output/gprofiler_x86_64.img
Expand Down
2 changes: 1 addition & 1 deletion container.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine AS gprofiler
FROM alpine:3.23.0 AS gprofiler

ARG ARCH
ARG EXE_PATH=build/${ARCH}/gprofiler
Expand Down
2 changes: 1 addition & 1 deletion pyinstaller.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ a = Analysis(scripts=['pyi_build.py'],
pathex=['/app'],
binaries=[],
datas=[('gprofiler/resources', 'gprofiler/resources')],
hiddenimports=[],
hiddenimports=['backports.tarfile'],
hookspath=[],
runtime_hooks=[],
excludes=['readline'],
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ WMI==1.5.1; sys.platform == "win32"
./granulate-utils/
humanfriendly==10.0
beautifulsoup4==4.13.3
backports.tarfile==1.2.0
9 changes: 8 additions & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,14 @@ def application_docker_image(
)
if application_image_tag == "musl":
pytest.xfail("This test does not work on aarch64 https://github.com/intel/gprofiler/issues/743")
yield build_image(docker_client, **application_docker_image_configs[image_name(runtime, application_image_tag)])
image = build_image(docker_client, **application_docker_image_configs[image_name(runtime, application_image_tag)])
yield image

# Clean up the test image after test completes to free disk space for subsequent tests
try:
docker_client.images.remove(image.id, force=True)
except Exception:
pass # Image might be in use by other tests or already removed


@fixture
Expand Down
Loading