mirror of
https://github.com/python/cpython.git
synced 2026-01-06 15:32:22 +00:00
gh-112088: Run autoreconf in GHA check_generated_files (#112090)
The "Check if generated files are up to date" job of GitHub Actions now runs the "autoreconf -ivf -Werror" command instead of the "make regen-configure" command to avoid depending on the external quay.io server. Add Tools/build/regen-configure.sh script to regenerate the configure with an Ubuntu container image. The "quay.io/tiran/cpython_autoconf:271" container image (https://github.com/tiran/cpython_autoconf) is no longer used.
This commit is contained in:
parent
7e2308aaa2
commit
d9fd33a869
9 changed files with 131 additions and 160 deletions
11
.github/workflows/build.yml
vendored
11
.github/workflows/build.yml
vendored
|
|
@ -120,7 +120,9 @@ jobs:
|
|||
|
||||
check_generated_files:
|
||||
name: 'Check if generated files are up to date'
|
||||
runs-on: ubuntu-latest
|
||||
# Don't use ubuntu-latest but a specific version to make the job
|
||||
# reproducible: to get the same tools versions (autoconf, aclocal, ...)
|
||||
runs-on: ubuntu-22.04
|
||||
timeout-minutes: 60
|
||||
needs: check_source
|
||||
if: needs.check_source.outputs.run_tests == 'true'
|
||||
|
|
@ -143,15 +145,16 @@ jobs:
|
|||
- name: Check Autoconf and aclocal versions
|
||||
run: |
|
||||
grep "Generated by GNU Autoconf 2.71" configure
|
||||
grep "aclocal 1.16.4" aclocal.m4
|
||||
grep "aclocal 1.16.5" aclocal.m4
|
||||
grep -q "runstatedir" configure
|
||||
grep -q "PKG_PROG_PKG_CONFIG" aclocal.m4
|
||||
- name: Configure CPython
|
||||
run: |
|
||||
# Build Python with the libpython dynamic library
|
||||
./configure --config-cache --with-pydebug --enable-shared
|
||||
- name: Regenerate autoconf files with container image
|
||||
run: make regen-configure
|
||||
- name: Regenerate autoconf files
|
||||
# Same command used by Tools/build/regen-configure.sh ($AUTORECONF)
|
||||
run: autoreconf -ivf -Werror
|
||||
- name: Build CPython
|
||||
run: |
|
||||
make -j4 regen-all
|
||||
|
|
|
|||
2
.github/workflows/posix-deps-apt.sh
vendored
2
.github/workflows/posix-deps-apt.sh
vendored
|
|
@ -1,9 +1,11 @@
|
|||
#!/bin/sh
|
||||
apt-get update
|
||||
|
||||
# autoconf-archive is needed by autoreconf (check_generated_files job)
|
||||
apt-get -yq install \
|
||||
build-essential \
|
||||
pkg-config \
|
||||
autoconf-archive \
|
||||
ccache \
|
||||
gdb \
|
||||
lcov \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue