diff options
| author | Victor Stinner <vstinner@python.org> | 2023-11-16 14:55:40 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-16 14:55:40 (GMT) |
| commit | a498433df2015143fe761dd1b839268fdba0e7d6 (patch) | |
| tree | 65048f2af9c1f9052674bb6e1869230e8c9c1bc2 /.github | |
| parent | 2e17a81719921da8e75e7035ab057fb7bd408d96 (diff) | |
| download | cpython-a498433df2015143fe761dd1b839268fdba0e7d6.zip cpython-a498433df2015143fe761dd1b839268fdba0e7d6.tar.gz cpython-a498433df2015143fe761dd1b839268fdba0e7d6.tar.bz2 | |
[3.12] gh-112088: Run autoreconf in GHA check_generated_files (GH-112090) (#112159)
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.
(cherry picked from commit d9fd33a869d2be769ff596530f63ee099465b037)
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build.yml | 11 | ||||
| -rwxr-xr-x | .github/workflows/posix-deps-apt.sh | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 80a2126..545dd8c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -147,7 +147,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' @@ -170,15 +172,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: | # Deepfreeze will usually cause global objects to be added or removed, diff --git a/.github/workflows/posix-deps-apt.sh b/.github/workflows/posix-deps-apt.sh index a220896..bbae378 100755 --- a/.github/workflows/posix-deps-apt.sh +++ b/.github/workflows/posix-deps-apt.sh @@ -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 \ |