From ef545bf0d07bdd49c19b8e6f6b2ff2a372bf6dbd Mon Sep 17 00:00:00 2001 From: nao0105aaa <126936958+nao0105aaa@users.noreply.github.com> Date: Wed, 9 Apr 2025 00:08:25 +0900 Subject: [PATCH 1/4] Update build_msi.yml --- .github/workflows/build_msi.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_msi.yml b/.github/workflows/build_msi.yml index c9993b75df1bac..b6ee3cf0b55770 100644 --- a/.github/workflows/build_msi.yml +++ b/.github/workflows/build_msi.yml @@ -44,4 +44,10 @@ jobs: steps: - uses: actions/checkout@v4 - name: Build CPython installer - run: .\Tools\msi\build.bat --doc -x64 + run: .\Tools\msi\buildrelease.bat -x64 + - name: Upload artifacts + uses: actions/upload-artifact@v4 + with: + name: build-artifacts + path: | + PCbuild/amd64/ From 623a6eb237a0fb7e189d0439603ea5562d5de746 Mon Sep 17 00:00:00 2001 From: nao0105aaa <126936958+nao0105aaa@users.noreply.github.com> Date: Wed, 9 Apr 2025 00:11:32 +0900 Subject: [PATCH 2/4] Update build.yml --- .github/workflows/build.yml | 131 ++---------------------------------- 1 file changed, 5 insertions(+), 126 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7b415b3d14fab9..4f7e6b0513a12d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -174,130 +174,9 @@ jobs: run: .\python.bat -m test.pythoninfo - name: Tests run: .\PCbuild\rt.bat -p x64 -q -uall -u-cpu -rwW --slowest --timeout=1200 -j0 - - build_macos: - name: 'macOS' - runs-on: macos-latest - needs: check_source - if: needs.check_source.outputs.run_tests == 'true' - env: - HOMEBREW_NO_ANALYTICS: 1 - HOMEBREW_NO_AUTO_UPDATE: 1 - HOMEBREW_NO_INSTALL_CLEANUP: 1 - PYTHONSTRICTEXTENSIONBUILD: 1 - steps: - - uses: actions/checkout@v4 - - name: Install Homebrew dependencies - run: | - brew install pkg-config openssl@3.0 xz gdbm tcl-tk@8 - # Because alternate versions are not symlinked into place by default: - brew link tcl-tk@8 - - name: Configure CPython - run: | - CPPFLAGS="-I$(brew --prefix gdbm)/include -I$(brew --prefix xz)/include" \ - LDFLAGS="-L$(brew --prefix gdbm)/lib -L$(brew --prefix xz)/lib" \ - ./configure \ - --with-pydebug \ - --prefix=/opt/python-dev \ - --with-openssl="$(brew --prefix openssl@3.0)" \ - --with-dbmliborder=gdbm:ndbm - # (--with-dbmliborder needed for homebrew's gdbm 1.24: see gh-89452) - - name: Build CPython - run: make -j4 - - name: Display build info - run: make pythoninfo - - name: Tests - run: make buildbottest TESTOPTS="-j4 -uall,-cpu" - - build_ubuntu: - name: 'Ubuntu' - runs-on: ubuntu-24.04 - needs: check_source - if: needs.check_source.outputs.run_tests == 'true' - env: - OPENSSL_VER: 3.0.11 - PYTHONSTRICTEXTENSIONBUILD: 1 - steps: - - uses: actions/checkout@v4 - - 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/cache@v4 - 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: Tests - run: xvfb-run make buildbottest TESTOPTS="-j4 -uall,-cpu" - - build_ubuntu_ssltests: - name: 'Ubuntu SSL tests with OpenSSL' - runs-on: ubuntu-24.04 - timeout-minutes: 60 - 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.1w, 3.0.11, 3.1.3] - 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@v4 + - name: Upload artifacts + uses: actions/upload-artifact@v4 with: - persist-credentials: false - - 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/cache@v4 - 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.2 - - 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 + name: build-artifacts + path: | + PCbuild/amd64/ From 26b00c117ca559732382ea4fff586ce5d5630ffd Mon Sep 17 00:00:00 2001 From: nao0105aaa <126936958+nao0105aaa@users.noreply.github.com> Date: Mon, 28 Jul 2025 20:01:21 +0900 Subject: [PATCH 3/4] Update build_msi.yml From 8c4cb3e48cc57665d902a5a19bcdb7aab514463e Mon Sep 17 00:00:00 2001 From: nao0105aaa <126936958+nao0105aaa@users.noreply.github.com> Date: Mon, 28 Jul 2025 23:04:50 +0900 Subject: [PATCH 4/4] Update build_msi.yml --- .github/workflows/build_msi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_msi.yml b/.github/workflows/build_msi.yml index b6ee3cf0b55770..430039837c2da0 100644 --- a/.github/workflows/build_msi.yml +++ b/.github/workflows/build_msi.yml @@ -36,7 +36,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Build CPython installer - run: .\Tools\msi\build.bat --doc -x86 + run: .\Tools\msi\buildrelease.bat -x64 build_win_amd64: name: 'Windows (x64) Installer'