Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc8d477d

Browse files
authored
Merge branch 'main' into so_long_and_thanks_for_all_the_Tix
2 parents0524a21 +2b7027d commitc8d477d

File tree

73 files changed

+273
-7902
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+273
-7902
lines changed

‎.github/workflows/build.yml

Lines changed: 45 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,11 @@ jobs:
8383
if:needs.check_source.outputs.run_tests == 'true'
8484
steps:
8585
-uses:actions/checkout@v3
86+
-name:Restore config.cache
87+
uses:actions/cache@v3
88+
with:
89+
path:config.cache
90+
key:${{ github.job }}-${{ runner.os }}-${{ hashFiles('configure', 'configure.ac', '.github/workflows/build.yml') }}
8691
-uses:actions/setup-python@v3
8792
-name:Install Dependencies
8893
run:sudo ./.github/workflows/posix-deps-apt.sh
@@ -99,7 +104,7 @@ jobs:
99104
-name:Configure CPython
100105
run:|
101106
# Build Python with the libpython dynamic library
102-
./configure --with-pydebug --enable-shared
107+
./configure --config-cache --with-pydebug --enable-shared
103108
-name:Regenerate autoconf files with container image
104109
run:make regen-configure
105110
-name:Build CPython
@@ -180,6 +185,11 @@ jobs:
180185
PYTHONSTRICTEXTENSIONBUILD:1
181186
steps:
182187
-uses:actions/checkout@v3
188+
-name:Restore config.cache
189+
uses:actions/cache@v3
190+
with:
191+
path:config.cache
192+
key:${{ github.job }}-${{ runner.os }}-${{ hashFiles('configure', 'configure.ac', '.github/workflows/build.yml') }}
183193
-name:Install Homebrew dependencies
184194
run:brew install pkg-config openssl@1.1 xz gdbm tcl-tk
185195
-name:Configure CPython
@@ -188,6 +198,7 @@ jobs:
188198
LDFLAGS="-L$(brew --prefix gdbm)/lib -I$(brew --prefix xz)/lib" \
189199
PKG_CONFIG_PATH="$(brew --prefix tcl-tk)/lib/pkgconfig" \
190200
./configure \
201+
--config-cache \
191202
--with-pydebug \
192203
--prefix=/opt/python-dev \
193204
--with-openssl="$(brew --prefix openssl@1.1)"
@@ -240,9 +251,18 @@ jobs:
240251
run:mkdir -p $CPYTHON_RO_SRCDIR $CPYTHON_BUILDDIR
241252
-name:Bind mount sources read-only
242253
run:sudo mount --bind -o ro $GITHUB_WORKSPACE $CPYTHON_RO_SRCDIR
254+
-name:Restore config.cache
255+
uses:actions/cache@v3
256+
with:
257+
path:${{ env.CPYTHON_BUILDDIR }}/config.cache
258+
key:${{ github.job }}-${{ runner.os }}-${{ hashFiles('configure', 'configure.ac', '.github/workflows/build.yml') }}
243259
-name:Configure CPython out-of-tree
244260
working-directory:${{ env.CPYTHON_BUILDDIR }}
245-
run:../cpython-ro-srcdir/configure --with-pydebug --with-openssl=$OPENSSL_DIR
261+
run:|
262+
../cpython-ro-srcdir/configure \
263+
--config-cache \
264+
--with-pydebug \
265+
--with-openssl=$OPENSSL_DIR
246266
-name:Build CPython out-of-tree
247267
working-directory:${{ env.CPYTHON_BUILDDIR }}
248268
run:make -j4
@@ -273,6 +293,11 @@ jobs:
273293
LD_LIBRARY_PATH:${{ github.workspace }}/multissl/openssl/${{ matrix.openssl_ver }}/lib
274294
steps:
275295
-uses:actions/checkout@v3
296+
-name:Restore config.cache
297+
uses:actions/cache@v3
298+
with:
299+
path:config.cache
300+
key:${{ github.job }}-${{ runner.os }}-${{ hashFiles('configure', 'configure.ac', '.github/workflows/build.yml') }}
276301
-name:Register gcc problem matcher
277302
run:echo "::add-matcher::.github/problem-matchers/gcc.json"
278303
-name:Install Dependencies
@@ -297,7 +322,7 @@ jobs:
297322
-name:Configure ccache action
298323
uses:hendrikmuhs/ccache-action@v1.2
299324
-name:Configure CPython
300-
run:./configure --with-pydebug --with-openssl=$OPENSSL_DIR
325+
run:./configure --config-cache --with-pydebug --with-openssl=$OPENSSL_DIR
301326
-name:Build CPython
302327
run:make -j4
303328
-name:Display build info
@@ -306,7 +331,7 @@ jobs:
306331
run:./python Lib/test/ssltests.py
307332

308333
test_hypothesis:
309-
name:"HypothesisTests on Ubuntu"
334+
name:"Hypothesistests on Ubuntu"
310335
runs-on:ubuntu-20.04
311336
timeout-minutes:60
312337
needs:check_source
@@ -347,9 +372,18 @@ jobs:
347372
run:mkdir -p $CPYTHON_RO_SRCDIR $CPYTHON_BUILDDIR
348373
-name:Bind mount sources read-only
349374
run:sudo mount --bind -o ro $GITHUB_WORKSPACE $CPYTHON_RO_SRCDIR
375+
-name:Restore config.cache
376+
uses:actions/cache@v3
377+
with:
378+
path:${{ env.CPYTHON_BUILDDIR }}/config.cache
379+
key:${{ github.job }}-${{ runner.os }}-${{ hashFiles('configure', 'configure.ac', '.github/workflows/build.yml') }}
350380
-name:Configure CPython out-of-tree
351381
working-directory:${{ env.CPYTHON_BUILDDIR }}
352-
run:../cpython-ro-srcdir/configure --with-pydebug --with-openssl=$OPENSSL_DIR
382+
run:|
383+
../cpython-ro-srcdir/configure \
384+
--config-cache \
385+
--with-pydebug \
386+
--with-openssl=$OPENSSL_DIR
353387
-name:Build CPython out-of-tree
354388
working-directory:${{ env.CPYTHON_BUILDDIR }}
355389
run:make -j4
@@ -417,6 +451,11 @@ jobs:
417451
ASAN_OPTIONS:detect_leaks=0:allocator_may_return_null=1:handle_segv=0
418452
steps:
419453
-uses:actions/checkout@v3
454+
-name:Restore config.cache
455+
uses:actions/cache@v3
456+
with:
457+
path:config.cache
458+
key:${{ github.job }}-${{ runner.os }}-${{ hashFiles('configure', 'configure.ac', '.github/workflows/build.yml') }}
420459
-name:Register gcc problem matcher
421460
run:echo "::add-matcher::.github/problem-matchers/gcc.json"
422461
-name:Install Dependencies
@@ -445,7 +484,7 @@ jobs:
445484
-name:Configure ccache action
446485
uses:hendrikmuhs/ccache-action@v1.2
447486
-name:Configure CPython
448-
run:./configure --with-address-sanitizer --without-pymalloc
487+
run:./configure --config-cache --with-address-sanitizer --without-pymalloc
449488
-name:Build CPython
450489
run:make -j4
451490
-name:Display build info

‎.github/workflows/build_msi.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@ on:
88
-'3.*'
99
paths:
1010
-'Tools/msi/**'
11+
-'.github/workflows/build_msi.yml'
1112
pull_request:
1213
branches:
1314
-'main'
1415
-'3.*'
1516
paths:
1617
-'Tools/msi/**'
18+
-'.github/workflows/build_msi.yml'
1719

1820
permissions:
1921
contents:read
@@ -33,4 +35,4 @@ jobs:
3335
steps:
3436
-uses:actions/checkout@v3
3537
-name:Build CPython installer
36-
run:.\Tools\msi\build.bat -${{ matrix.type }}
38+
run:.\Tools\msi\build.bat --doc -${{ matrix.type }}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp