From: Donghee Na Date: Mon, 30 Oct 2023 14:36:58 +0000 (+0900) Subject: Update X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d874a25e355b7f5b0bf1d8057b675667814833dc;p=thirdparty%2FPython%2Fcpython.git Update --- diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 29c0f01a7d67..87e41feaada2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -540,7 +540,7 @@ jobs: - check_source # Transitive dependency, needed to access `run_tests` value - check-docs - check_generated_files - - build_win + - build_windows - build_macos - build_ubuntu - build_ubuntu_ssltests diff --git a/.github/workflows/reusable-build-win.yml b/.github/workflows/reusable-build-win.yml deleted file mode 100644 index d75d9f2da075..000000000000 --- a/.github/workflows/reusable-build-win.yml +++ /dev/null @@ -1,53 +0,0 @@ -on: - workflow_call: - inputs: - free-threaded: - required: false - type: boolean - default: false - -jobs: - build_win_32: - name: 'build and test (x86)' - runs-on: windows-latest - timeout-minutes: 60 - env: - IncludeUwp: 'true' - steps: - - uses: actions/checkout@v4 - - name: Build CPython - run: .\PCbuild\build.bat -e -d -p Win32 ${{ inputs.free-threaded && '--disable-gil' || '' }} - - name: Display build info - run: .\python.bat -m test.pythoninfo - - name: Tests - run: .\PCbuild\rt.bat -p Win32 -d -q --fast-ci - - build_win_amd64: - name: 'build and test (x64)' - runs-on: windows-latest - timeout-minutes: 60 - env: - IncludeUwp: 'true' - steps: - - uses: actions/checkout@v4 - - name: Register MSVC problem matcher - run: echo "::add-matcher::.github/problem-matchers/msvc.json" - - name: Build CPython - run: .\PCbuild\build.bat -e -d -p x64 ${{ inputs.free-threaded && '--disable-gil' || '' }} - - name: Display build info - run: .\python.bat -m test.pythoninfo - - name: Tests - run: .\PCbuild\rt.bat -p x64 -d -q --fast-ci - - build_win_arm64: - name: 'build (arm64)' - runs-on: windows-latest - timeout-minutes: 60 - env: - IncludeUwp: 'true' - steps: - - uses: actions/checkout@v4 - - name: Register MSVC problem matcher - run: echo "::add-matcher::.github/problem-matchers/msvc.json" - - name: Build CPython - run: .\PCbuild\build.bat -e -d -p arm64 ${{ inputs.free-threaded && '--disable-gil' || '' }}