Skip to content

Commit 7c7a68f

Browse files
committed
ci: add missing font dependencies
Also, use the script posix-deps-zypp.sh for all installation
1 parent bf2361f commit 7c7a68f

File tree

3 files changed

+33
-28
lines changed

3 files changed

+33
-28
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,9 @@ jobs:
3333
runs-on: ubuntu-latest
3434
needs: check_source
3535
if: needs.check_source.outputs.run_tests == 'true'
36-
3736
# Use a specific image version for reproducible builds
3837
container:
3938
image: opensuse/leap:15.5
40-
4139
strategy:
4240
fail-fast: false
4341
matrix:
@@ -53,30 +51,17 @@ jobs:
5351
OPENSSL_VER: 1.1.1u
5452

5553
steps:
56-
- name: Install All Dependencies
54+
55+
- name: Install Git and Tar
5756
run: |
58-
zypper --non-interactive install --auto-agree-with-licenses \
59-
git \
60-
tar \
61-
gcc \
62-
make \
63-
python3 \
64-
libabigail-tools \
65-
xorg-x11-server-Xvfb \
66-
libffi-devel \
67-
zlib-devel \
68-
ncurses-devel \
69-
gdbm-devel \
70-
sqlite3-devel \
71-
tk-devel \
72-
readline-devel \
73-
xz-devel \
74-
bzip2 \
75-
openssl \
76-
xvfb-run
57+
zypper ref
58+
zypper -n install -y git-core tar
7759
7860
- uses: actions/checkout@v4
7961

62+
- name: Install All Dependencies
63+
run: sh -x ./.github/workflows/posix-deps-zypp.sh
64+
8065
- name: 'Restore OpenSSL build'
8166
if: matrix.task == 'build-and-test'
8267
id: cache-openssl
Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
#!/bin/sh
2-
zypper refresh --force
2+
zypper refresh
33

4-
zypper install --auto-agree-with-licenses --force \
5-
pattern:devel_rpm_build pattern:devel_C_C++ \
4+
zypper --non-interactive install --no-confirm --auto-agree-with-licenses --force \
5+
pattern:devel_rpm_build pattern:devel_C_C++ make python3 \
6+
libabigail-tools xorg-x11-server-Xvfb xvfb-run \
7+
cantarell-fonts google-droid-fonts google-inconsolata-fonts dejavu-fonts \
8+
libffi-devel \
9+
xz-devel \
10+
bzip2 \
611
zlib-devel \
712
libbz2-devel \
813
ncurses-devel \
914
readline6-devel \
1015
sqlite3-devel \
11-
openssl-devel \
16+
libopenssl-devel \
1217
gdbm-devel \
1318
tk-devel \
1419
lzma \
1520
lzma-devel \
16-
liblzma-devel \
1721
libffi-devel \
1822
uuid-devel \
19-
xvfb \
23+
xvfb-run \
2024
lcov

Makefile.pre.in

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -721,6 +721,22 @@ regen-importlib: Programs/_freeze_importlib
721721
$(srcdir)/Python/importlib.h.new
722722
$(UPDATE_FILE) $(srcdir)/Python/importlib.h $(srcdir)/Python/importlib.h.new
723723

724+
############################################################################
725+
# ABI
726+
727+
.PHONY: regen-abidump
728+
regen-abidump: all
729+
@$(MKDIR_P) $(srcdir)/Doc/data/
730+
abidw "libpython$(LDVERSION).so" --no-architecture --out-file $(srcdir)/Doc/data/python$(LDVERSION).abi.new
731+
@$(UPDATE_FILE) --create $(srcdir)/Doc/data/python$(LDVERSION).abi $(srcdir)/Doc/data/python$(LDVERSION).abi.new
732+
733+
.PHONY: check-abidump
734+
check-abidump: all
735+
abidiff $(srcdir)/Doc/data/python$(LDVERSION).abi "libpython$(LDVERSION).so" --drop-private-types --no-architecture --no-added-syms
736+
737+
.PHONY: regen-limited-abi
738+
regen-limited-abi: all
739+
$(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/build/stable_abi.py --generate-all
724740

725741
############################################################################
726742
# Regenerate all generated files

0 commit comments

Comments
 (0)