forked from python/cpython
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into gh87804-statvfs-32bit
- Loading branch information
Showing
1,138 changed files
with
39,283 additions
and
23,467 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -128,11 +128,11 @@ jobs: | |
| if: needs.check_source.outputs.run_tests == 'true' | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: actions/setup-python@v4 | ||
| - uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: '3.x' | ||
| - name: Restore config.cache | ||
| uses: actions/cache@v3 | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: config.cache | ||
| key: ${{ github.job }}-${{ runner.os }}-${{ needs.check_source.outputs.config_hash }}-${{ env.pythonLocation }} | ||
|
|
@@ -142,6 +142,8 @@ jobs: | |
| run: echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV | ||
| - name: Configure ccache action | ||
| uses: hendrikmuhs/[email protected] | ||
| with: | ||
| save: false | ||
| - name: Check Autoconf and aclocal versions | ||
| run: | | ||
| grep "Generated by GNU Autoconf 2.71" configure | ||
|
|
@@ -187,13 +189,13 @@ jobs: | |
| if: needs.check_source.outputs.run_tests == 'true' | ||
| uses: ./.github/workflows/reusable-windows.yml | ||
|
|
||
| build_windows_free_threaded: | ||
| name: 'Windows (free-threaded)' | ||
| build_windows_free_threading: | ||
| name: 'Windows (free-threading)' | ||
| needs: check_source | ||
| if: needs.check_source.outputs.run_tests == 'true' | ||
| uses: ./.github/workflows/reusable-windows.yml | ||
| with: | ||
| free-threaded: true | ||
| free-threading: true | ||
|
|
||
| build_macos: | ||
| name: 'macOS' | ||
|
|
@@ -203,14 +205,14 @@ jobs: | |
| with: | ||
| config_hash: ${{ needs.check_source.outputs.config_hash }} | ||
|
|
||
| build_macos_free_threaded: | ||
| name: 'macOS (free-threaded)' | ||
| build_macos_free_threading: | ||
| name: 'macOS (free-threading)' | ||
| needs: check_source | ||
| if: needs.check_source.outputs.run_tests == 'true' | ||
| uses: ./.github/workflows/reusable-macos.yml | ||
| with: | ||
| config_hash: ${{ needs.check_source.outputs.config_hash }} | ||
| free-threaded: true | ||
| free-threading: true | ||
|
|
||
| build_ubuntu: | ||
| name: 'Ubuntu' | ||
|
|
@@ -225,8 +227,8 @@ jobs: | |
| --with-pydebug \ | ||
| --with-openssl=$OPENSSL_DIR | ||
| build_ubuntu_free_threaded: | ||
| name: 'Ubuntu (free-threaded)' | ||
| build_ubuntu_free_threading: | ||
| name: 'Ubuntu (free-threading)' | ||
| needs: check_source | ||
| if: needs.check_source.outputs.run_tests == 'true' | ||
| uses: ./.github/workflows/reusable-ubuntu.yml | ||
|
|
@@ -248,7 +250,7 @@ jobs: | |
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| openssl_ver: [1.1.1w, 3.0.11, 3.1.3] | ||
| openssl_ver: [1.1.1w, 3.0.13, 3.1.5, 3.2.1] | ||
| env: | ||
| OPENSSL_VER: ${{ matrix.openssl_ver }} | ||
| MULTISSL_DIR: ${{ github.workspace }}/multissl | ||
|
|
@@ -257,7 +259,7 @@ jobs: | |
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Restore config.cache | ||
| uses: actions/cache@v3 | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: config.cache | ||
| key: ${{ github.job }}-${{ runner.os }}-${{ needs.check_source.outputs.config_hash }} | ||
|
|
@@ -272,7 +274,7 @@ jobs: | |
| echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> $GITHUB_ENV | ||
| - name: 'Restore OpenSSL build' | ||
| id: cache-openssl | ||
| uses: actions/cache@v3 | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: ./multissl/openssl/${{ env.OPENSSL_VER }} | ||
| key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }} | ||
|
|
@@ -284,6 +286,8 @@ jobs: | |
| echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV | ||
| - name: Configure ccache action | ||
| uses: hendrikmuhs/[email protected] | ||
| with: | ||
| save: false | ||
| - name: Configure CPython | ||
| run: ./configure --config-cache --with-pydebug --with-openssl=$OPENSSL_DIR | ||
| - name: Build CPython | ||
|
|
@@ -300,7 +304,7 @@ jobs: | |
| needs: check_source | ||
| if: needs.check_source.outputs.run_tests == 'true' && needs.check_source.outputs.run_hypothesis == 'true' | ||
| env: | ||
| OPENSSL_VER: 3.0.11 | ||
| OPENSSL_VER: 3.0.13 | ||
| PYTHONSTRICTEXTENSIONBUILD: 1 | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
|
|
@@ -315,7 +319,7 @@ jobs: | |
| echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> $GITHUB_ENV | ||
| - name: 'Restore OpenSSL build' | ||
| id: cache-openssl | ||
| uses: actions/cache@v3 | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: ./multissl/openssl/${{ env.OPENSSL_VER }} | ||
| key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }} | ||
|
|
@@ -327,6 +331,8 @@ jobs: | |
| echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV | ||
| - name: Configure ccache action | ||
| uses: hendrikmuhs/[email protected] | ||
| with: | ||
| save: false | ||
| - name: Setup directory envs for out-of-tree builds | ||
| run: | | ||
| echo "CPYTHON_RO_SRCDIR=$(realpath -m ${GITHUB_WORKSPACE}/../cpython-ro-srcdir)" >> $GITHUB_ENV | ||
|
|
@@ -336,7 +342,7 @@ jobs: | |
| - name: Bind mount sources read-only | ||
| run: sudo mount --bind -o ro $GITHUB_WORKSPACE $CPYTHON_RO_SRCDIR | ||
| - name: Restore config.cache | ||
| uses: actions/cache@v3 | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: ${{ env.CPYTHON_BUILDDIR }}/config.cache | ||
| key: ${{ github.job }}-${{ runner.os }}-${{ needs.check_source.outputs.config_hash }} | ||
|
|
@@ -369,7 +375,7 @@ jobs: | |
| ./python -m venv $VENV_LOC && $VENV_PYTHON -m pip install -r ${GITHUB_WORKSPACE}/Tools/requirements-hypothesis.txt | ||
| - name: 'Restore Hypothesis database' | ||
| id: cache-hypothesis-database | ||
| uses: actions/cache@v3 | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: ./hypothesis | ||
| key: hypothesis-database-${{ github.head_ref || github.run_id }} | ||
|
|
@@ -395,7 +401,7 @@ jobs: | |
| -x test_subprocess \ | ||
| -x test_signal \ | ||
| -x test_sysconfig | ||
| - uses: actions/upload-artifact@v3 | ||
| - uses: actions/upload-artifact@v4 | ||
| if: always() | ||
| with: | ||
| name: hypothesis-example-db | ||
|
|
@@ -409,13 +415,13 @@ jobs: | |
| needs: check_source | ||
| if: needs.check_source.outputs.run_tests == 'true' | ||
| env: | ||
| OPENSSL_VER: 3.0.11 | ||
| OPENSSL_VER: 3.0.13 | ||
| PYTHONSTRICTEXTENSIONBUILD: 1 | ||
| ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0 | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Restore config.cache | ||
| uses: actions/cache@v3 | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: config.cache | ||
| key: ${{ github.job }}-${{ runner.os }}-${{ needs.check_source.outputs.config_hash }} | ||
|
|
@@ -434,7 +440,7 @@ jobs: | |
| echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> $GITHUB_ENV | ||
| - name: 'Restore OpenSSL build' | ||
| id: cache-openssl | ||
| uses: actions/cache@v3 | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: ./multissl/openssl/${{ env.OPENSSL_VER }} | ||
| key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }} | ||
|
|
@@ -446,6 +452,9 @@ jobs: | |
| echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV | ||
| - name: Configure ccache action | ||
| uses: hendrikmuhs/[email protected] | ||
| with: | ||
| save: ${{ github.event_name == 'push' }} | ||
| max-size: "200M" | ||
| - name: Configure CPython | ||
| run: ./configure --config-cache --with-address-sanitizer --without-pymalloc | ||
| - name: Build CPython | ||
|
|
@@ -483,14 +492,14 @@ jobs: | |
| output-sarif: true | ||
| sanitizer: ${{ matrix.sanitizer }} | ||
| - name: Upload crash | ||
| uses: actions/upload-artifact@v3 | ||
| uses: actions/upload-artifact@v4 | ||
| if: failure() && steps.build.outcome == 'success' | ||
| with: | ||
| name: ${{ matrix.sanitizer }}-artifacts | ||
| path: ./out/artifacts | ||
| - name: Upload SARIF | ||
| if: always() && steps.build.outcome == 'success' | ||
| uses: github/codeql-action/upload-sarif@v2 | ||
| uses: github/codeql-action/upload-sarif@v3 | ||
| with: | ||
| sarif_file: cifuzz-sarif/results.sarif | ||
| checkout_path: cifuzz-sarif | ||
|
|
@@ -504,12 +513,12 @@ jobs: | |
| - check-docs | ||
| - check_generated_files | ||
| - build_macos | ||
| - build_macos_free_threaded | ||
| - build_macos_free_threading | ||
| - build_ubuntu | ||
| - build_ubuntu_free_threaded | ||
| - build_ubuntu_free_threading | ||
| - build_ubuntu_ssltests | ||
| - build_windows | ||
| - build_windows_free_threaded | ||
| - build_windows_free_threading | ||
| - test_hypothesis | ||
| - build_asan | ||
| - cifuzz | ||
|
|
@@ -537,12 +546,12 @@ jobs: | |
| && ' | ||
| check_generated_files, | ||
| build_macos, | ||
| build_macos_free_threaded, | ||
| build_macos_free_threading, | ||
| build_ubuntu, | ||
| build_ubuntu_free_threaded, | ||
| build_ubuntu_free_threading, | ||
| build_ubuntu_ssltests, | ||
| build_windows, | ||
| build_windows_free_threaded, | ||
| build_windows_free_threading, | ||
| build_asan, | ||
| ' | ||
| || '' | ||
|
|
||
Oops, something went wrong.