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 remote-tracking branch 'origin/main' into bpo_42035
* origin/main: (1146 commits) bpo-42064: Finalise establishing sqlite3 global state (pythonGH-27155) bpo-44678: Separate error message for discontinuous padding in binascii.a2b_base64 strict mode (pythonGH-27249) correct spelling (pythonGH-27076) bpo-44524: Add missed __name__ and __qualname__ to typing module objects (python#27237) bpo-27513: email.utils.getaddresses() now handles Header objects (python#13797) Clean up comma usage in Doc/library/functions.rst (python#27083) bpo-42238: Fix small rst issue in NEWS.d/. (python#27238) bpo-41972: Tweak fastsearch.h string search algorithms (pythonGH-27091) bpo-44340: Add support for building with clang full/thin lto (pythonGH-27231) bpo-44661: Update property_descr_set to use vectorcall if possible. (pythonGH-27206) bpo-44645: Check for interrupts on any potentially backwards edge (pythonGH-27216) bpo-41546: make pprint (like print) not write to stdout when it is None (pythonGH-26810) bpo-44554: refactor pdb targets (and internal tweaks) (pythonGH-26992) bpo-43086: Add handling for out-of-spec data in a2b_base64 (pythonGH-24402) bpo-44561: Update hyperlinks in Doc/distributing/index.rst (python#27032) bpo-42355: symtable.get_namespace() now checks whether there are multiple or any namespaces found (pythonGH-23278) bpo-44654: Do not export the union type related symbols (pythonGH-27223) bpo-44633: Fix parameter substitution of the union type with wrong types. (pythonGH-27218) bpo-44654: Refactor and clean up the union type implementation (pythonGH-27196) bpo-20291: Fix MSVC warnings in getargs.c (pythonGH-27211) ...
- Loading branch information
Showing
1,321 changed files
with
107,682 additions
and
54,795 deletions.
There are no files selected for viewing
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
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
Validating CODEOWNERS rules …
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,30 +6,34 @@ name: Tests | |
| on: | ||
| push: | ||
| branches: | ||
| - master | ||
| - 3.9 | ||
| - 3.8 | ||
| - 3.7 | ||
| - 'main' | ||
| - '3.10' | ||
| - '3.9' | ||
| - '3.8' | ||
| - '3.7' | ||
| pull_request: | ||
| branches: | ||
| - master | ||
| - 3.9 | ||
| - 3.8 | ||
| - 3.7 | ||
| - 'main' | ||
| - '3.10' | ||
| - '3.9' | ||
| - '3.8' | ||
| - '3.7' | ||
|
|
||
| jobs: | ||
| check_source: | ||
| name: 'Check for source changes' | ||
| runs-on: ubuntu-latest | ||
| outputs: | ||
| run_tests: ${{ steps.check.outputs.run_tests }} | ||
| run_ssl_tests: ${{ steps.check.outputs.run_ssl_tests }} | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - name: Check for source changes | ||
| id: check | ||
| run: | | ||
| if [ -z "$GITHUB_BASE_REF" ]; then | ||
| echo '::set-output name=run_tests::true' | ||
| echo '::set-output name=run_ssl_tests::true' | ||
| else | ||
| git fetch origin $GITHUB_BASE_REF --depth=1 | ||
| # git diff "origin/$GITHUB_BASE_REF..." (3 dots) may be more | ||
|
|
@@ -46,6 +50,7 @@ jobs: | |
| # | ||
| # https://github.com/python/core-workflow/issues/373 | ||
| git diff --name-only origin/$GITHUB_BASE_REF.. | grep -qvE '(\.rst$|^Doc|^Misc)' && echo '::set-output name=run_tests::true' || true | ||
| git diff --name-only origin/$GITHUB_BASE_REF.. | grep -qE '(ssl|hashlib|hmac|^.github)' && echo '::set-output name=run_ssl_tests::true' || true | ||
| fi | ||
| check_generated_files: | ||
|
|
@@ -127,31 +132,132 @@ jobs: | |
|
|
||
| build_ubuntu: | ||
| name: 'Ubuntu' | ||
| runs-on: ubuntu-18.04 | ||
| runs-on: ubuntu-20.04 | ||
| needs: check_source | ||
| if: needs.check_source.outputs.run_tests == 'true' | ||
| env: | ||
| OPENSSL_VER: 1.1.1f | ||
| OPENSSL_VER: 1.1.1k | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - name: Register gcc problem matcher | ||
| run: echo "::add-matcher::.github/problem-matchers/gcc.json" | ||
| - name: Install Dependencies | ||
| run: sudo ./.github/workflows/posix-deps-apt.sh | ||
| - name: Configure OpenSSL env vars | ||
| run: | | ||
| echo "MULTISSL_DIR=${GITHUB_WORKSPACE}/multissl" >> $GITHUB_ENV | ||
| echo "OPENSSL_DIR=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}" >> $GITHUB_ENV | ||
| echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> $GITHUB_ENV | ||
| - name: 'Restore OpenSSL build' | ||
| id: cache-openssl | ||
| uses: actions/[email protected].4 | ||
| uses: actions/[email protected].6 | ||
| with: | ||
| path: ./multissl/openssl/${{ env.OPENSSL_VER }} | ||
| key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }} | ||
| - name: Install OpenSSL | ||
| if: steps.cache-openssl.outputs.cache-hit != 'true' | ||
| run: python3 Tools/ssl/multissltests.py --steps=library --base-directory $PWD/multissl --openssl $OPENSSL_VER --system Linux | ||
| run: python3 Tools/ssl/multissltests.py --steps=library --base-directory $MULTISSL_DIR --openssl $OPENSSL_VER --system Linux | ||
| - name: Add ccache to PATH | ||
| run: | | ||
| echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV | ||
| - name: Configure ccache action | ||
| uses: hendrikmuhs/ccache-action@v1 | ||
| - name: Configure CPython | ||
| run: ./configure --with-pydebug --with-openssl=$PWD/multissl/openssl/$OPENSSL_VER | ||
| run: ./configure --with-pydebug --with-openssl=$OPENSSL_DIR | ||
| - name: Build CPython | ||
| run: make -j4 | ||
| - name: Display build info | ||
| run: make pythoninfo | ||
| - name: Tests | ||
| run: xvfb-run make buildbottest TESTOPTS="-j4 -uall,-cpu" | ||
|
|
||
| build_ubuntu_ssltests: | ||
| name: 'Ubuntu SSL tests with OpenSSL' | ||
| runs-on: ubuntu-20.04 | ||
| needs: check_source | ||
| if: needs.check_source.outputs.run_tests == 'true' && needs.check_source.outputs.run_ssl_tests == 'true' | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| openssl_ver: [1.1.1k, 3.0.0-beta1] | ||
| env: | ||
| OPENSSL_VER: ${{ matrix.openssl_ver }} | ||
| MULTISSL_DIR: ${{ github.workspace }}/multissl | ||
| OPENSSL_DIR: ${{ github.workspace }}/multissl/openssl/${{ matrix.openssl_ver }} | ||
| LD_LIBRARY_PATH: ${{ github.workspace }}/multissl/openssl/${{ matrix.openssl_ver }}/lib | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - name: Register gcc problem matcher | ||
| run: echo "::add-matcher::.github/problem-matchers/gcc.json" | ||
| - name: Install Dependencies | ||
| run: sudo ./.github/workflows/posix-deps-apt.sh | ||
| - name: Configure OpenSSL env vars | ||
| run: | | ||
| echo "MULTISSL_DIR=${GITHUB_WORKSPACE}/multissl" >> $GITHUB_ENV | ||
| echo "OPENSSL_DIR=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}" >> $GITHUB_ENV | ||
| echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> $GITHUB_ENV | ||
| - name: 'Restore OpenSSL build' | ||
| id: cache-openssl | ||
| uses: actions/[email protected] | ||
| with: | ||
| path: ./multissl/openssl/${{ env.OPENSSL_VER }} | ||
| key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }} | ||
| - name: Install OpenSSL | ||
| if: steps.cache-openssl.outputs.cache-hit != 'true' | ||
| run: python3 Tools/ssl/multissltests.py --steps=library --base-directory $MULTISSL_DIR --openssl $OPENSSL_VER --system Linux | ||
| - name: Add ccache to PATH | ||
| run: | | ||
| echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV | ||
| - name: Configure ccache action | ||
| uses: hendrikmuhs/ccache-action@v1 | ||
| - name: Configure CPython | ||
| run: ./configure --with-pydebug --with-openssl=$OPENSSL_DIR | ||
| - name: Build CPython | ||
| run: make -j4 | ||
| - name: Display build info | ||
| run: make pythoninfo | ||
| - name: SSL tests | ||
| run: ./python Lib/test/ssltests.py | ||
|
|
||
|
|
||
| build_asan: | ||
| name: 'Address sanitizer' | ||
| runs-on: ubuntu-20.04 | ||
| needs: check_source | ||
| if: needs.check_source.outputs.run_tests == 'true' | ||
| env: | ||
| OPENSSL_VER: 1.1.1k | ||
| ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0 | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - name: Register gcc problem matcher | ||
| run: echo "::add-matcher::.github/problem-matchers/gcc.json" | ||
| - name: Install Dependencies | ||
| run: sudo ./.github/workflows/posix-deps-apt.sh | ||
| - name: Configure OpenSSL env vars | ||
| run: | | ||
| echo "MULTISSL_DIR=${GITHUB_WORKSPACE}/multissl" >> $GITHUB_ENV | ||
| echo "OPENSSL_DIR=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}" >> $GITHUB_ENV | ||
| echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> $GITHUB_ENV | ||
| - name: 'Restore OpenSSL build' | ||
| id: cache-openssl | ||
| uses: actions/[email protected] | ||
| with: | ||
| path: ./multissl/openssl/${{ env.OPENSSL_VER }} | ||
| key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }} | ||
| - name: Install OpenSSL | ||
| if: steps.cache-openssl.outputs.cache-hit != 'true' | ||
| run: python3 Tools/ssl/multissltests.py --steps=library --base-directory $MULTISSL_DIR --openssl $OPENSSL_VER --system Linux | ||
| - name: Add ccache to PATH | ||
| run: | | ||
| echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV | ||
| - name: Configure ccache action | ||
| uses: hendrikmuhs/ccache-action@v1 | ||
| - name: Configure CPython | ||
| run: ./configure --with-address-sanitizer --without-pymalloc | ||
| - name: Build CPython | ||
| run: make -j4 | ||
| - name: Display build info | ||
| run: make pythoninfo | ||
| - name: Tests | ||
| run: xvfb-run make buildbottest TESTOPTS="-j4 -uall,-cpu -x test_ctypes test_crypt test_decimal test_faulthandler test_interpreters test___all__ test_idle test_tix test_tk test_ttk_guionly test_ttk_textonly" | ||
Oops, something went wrong.