Skip to content

Commit 7f3e933

Browse files
committed
gh-112088: Run autoreconf in GHA check_generated_files
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. Regenerate aclocal.m4 and configure using Ubuntu 22.04 versions.
1 parent 9302f05 commit 7f3e933

File tree

4 files changed

+76
-139
lines changed

4 files changed

+76
-139
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,23 +135,27 @@ jobs:
135135
path: config.cache
136136
key: ${{ github.job }}-${{ runner.os }}-${{ needs.check_source.outputs.config_hash }}-${{ env.pythonLocation }}
137137
- name: Install Dependencies
138-
run: sudo ./.github/workflows/posix-deps-apt.sh
138+
run: |
139+
sudo ./.github/workflows/posix-deps-apt.sh
139140
- name: Add ccache to PATH
140141
run: echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV
141142
- name: Configure ccache action
142143
uses: hendrikmuhs/[email protected]
143144
- name: Check Autoconf and aclocal versions
144145
run: |
145146
grep "Generated by GNU Autoconf 2.71" configure
146-
grep "aclocal 1.16.4" aclocal.m4
147+
grep "aclocal 1.16.5" aclocal.m4
147148
grep -q "runstatedir" configure
148149
grep -q "PKG_PROG_PKG_CONFIG" aclocal.m4
149150
- name: Configure CPython
150151
run: |
151152
# Build Python with the libpython dynamic library
152153
./configure --config-cache --with-pydebug --enable-shared
153-
- name: Regenerate autoconf files with container image
154-
run: make regen-configure
154+
- name: Regenerate autoconf files
155+
# gh-112088: Don't run "make regen-configure" to avoid dependency
156+
# on external quay.io server.
157+
run: |
158+
autoreconf -ivf -Werror
155159
- name: Build CPython
156160
run: |
157161
make -j4 regen-all

.github/workflows/posix-deps-apt.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/sh
22
apt-get update
33

4+
# autoconf-archive is needed by autoreconf (check_generated_files job)
45
apt-get -yq install \
56
build-essential \
67
pkg-config \

aclocal.m4

Lines changed: 7 additions & 75 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)