Skip to content

Commit cce8126

Browse files
committed
reverted back: no more tests to build cirrus ci from source on linux
1 parent 5937c19 commit cce8126

File tree

5 files changed

+4
-44
lines changed

5 files changed

+4
-44
lines changed

.cirrus.star

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ def main(ctx):
1919
if "[skip cirrus]" in dct["message"] or "[skip ci]" in dct["message"]:
2020
return []
2121

22-
# this configuration(default) runs linux_aarch64 + macosx_arm64 builds from source.
22+
# this configuration(default) runs macosx_arm64 builds from source.
2323
return fs.read("ci/cirrus_general_ci.yml")

.github/workflows/test-src-build-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
strategy:
3838
matrix:
39-
arch: ["amd64", "arm/v7"]
39+
arch: ["amd64", "arm64", "arm/v7"]
4040
docker_file: ["Alpine_3_15", "Alpine_3_17", "Debian_11", "Ubuntu_22_04"]
4141

4242
steps:

ci/cirrus_general_ci.yml

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -55,45 +55,3 @@ test_src_build_lite_macos_arm_task:
5555
- python3 -c "import pi_heif; print(pi_heif.libheif_info())"
5656
perform_tests_script:
5757
- python3 -m pytest -rs
58-
59-
test_src_build_full_linux_arm_task:
60-
only_if: "changesInclude(
61-
'ci/cirrus_general_ci.yml',
62-
'docker/from_src/*.Dockerfile',
63-
'libheif/linux/**',
64-
'libheif/linux_*.py',
65-
'libheif/build.py',
66-
'libheif/public_api.h',
67-
'setup.*',
68-
'pyproject.toml')"
69-
70-
matrix:
71-
- name: From source(Linux) / Alpine-arm64
72-
compute_engine_instance:
73-
image_project: cirrus-images
74-
image: family/docker-builder-arm64
75-
architecture: arm64
76-
platform: linux
77-
cpu: 4
78-
memory: 4G
79-
80-
Alpine_3_15_build_script:
81-
- docker buildx build -f docker/from_src/Alpine_3_15.Dockerfile .
82-
83-
Alpine_3_17_build_script:
84-
- docker buildx build -f docker/from_src/Alpine_3_17.Dockerfile .
85-
86-
- name: From source(Linux) / Debian-arm64
87-
compute_engine_instance:
88-
image_project: cirrus-images
89-
image: family/docker-builder-arm64
90-
architecture: arm64
91-
platform: linux
92-
cpu: 4
93-
memory: 4G
94-
95-
Debian_11_build_script:
96-
- docker buildx build -f docker/from_src/Debian_11.Dockerfile .
97-
98-
Ubuntu_22_build_script:
99-
- docker buildx build -f docker/from_src/Ubuntu_22_04.Dockerfile .

docker/from_src/Alpine_3_15.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ RUN \
2525
python3 -m pip install -v "pillow_heif/.[tests]"; \
2626
else \
2727
python3 -m pip install -v "pillow_heif/.[tests-min]"; \
28+
export PH_TESTS_NO_HEVC_ENC=1; \
2829
fi && \
2930
echo "**** Build Done ****" && \
3031
python3 -c "import pillow_heif; print(pillow_heif.libheif_info())" && \

docker/from_src/Debian_11.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ RUN \
3131
python3 -m pip install -v "pillow_heif/.[tests]"; \
3232
else \
3333
python3 -m pip install -v "pillow_heif/.[tests-min]"; \
34+
export PH_TESTS_NO_HEVC_ENC=1; \
3435
fi && \
3536
echo "**** Build Done ****" && \
3637
python3 -c "import pillow_heif; print(pillow_heif.libheif_info())" && \

0 commit comments

Comments
 (0)