■ ■ ■ ■ ■ ■
.github/workflows/build.yml
| skipped 68 lines |
69 | 69 | | path: | |
70 | 70 | | ./ssl |
71 | 71 | | ./python |
72 | | - | key: ${{ matrix.jid }}-20220907 |
| 72 | + | key: ${{ matrix.jid }}-20220912 |
73 | 73 | | |
74 | 74 | | - name: Use pre-compiled Python |
75 | 75 | | if: matrix.python != '' |
| skipped 49 lines |
125 | 125 | | PYEXTERNALS_PATH="amd64" |
126 | 126 | | PYBUILDRELEASE_ARCH="x64" |
127 | 127 | | OPENSSL_CONFIG_TARGET="VC-WIN64A" |
| 128 | + | CHOC_OPS="" |
128 | 129 | | elif [[ "${arch}" == "Win32" ]]; then |
129 | 130 | | PYEXTERNALS_PATH="win32" |
130 | 131 | | PYBUILDRELEASE_ARCH="Win32" |
131 | 132 | | OPENSSL_CONFIG_TARGET="VC-WIN32" |
| 133 | + | CHOC_OPS="--forcex86" |
132 | 134 | | fi |
133 | 135 | | echo "We'll run make with: ${MAKEOPT}" |
134 | 136 | | echo "JID=${jid}" >> $GITHUB_ENV |
| skipped 4 lines |
139 | 141 | | echo "PYEXTERNALS_PATH=${PYEXTERNALS_PATH}" >> $GITHUB_ENV |
140 | 142 | | echo "PYBUILDRELEASE_ARCH=${PYBUILDRELEASE_ARCH}" >> $GITHUB_ENV |
141 | 143 | | echo "OPENSSL_CONFIG_TARGET=${OPENSSL_CONFIG_TARGET}" >> $GITHUB_ENV |
| 144 | + | echo "CHOC_OPS=${CHOC_OPS}" >> $GITHUB_ENV |
142 | 145 | | echo "LD_LIBRARY_PATH=${OPENSSL_INSTALL_PATH}/lib:${PYTHON_INSTALL_PATH}/lib" >> $GITHUB_ENV |
143 | 146 | | |
144 | 147 | | - name: Get latest stable OpenSSL source |
| skipped 11 lines |
156 | 159 | | if: matrix.os == 'windows-2022' && steps.cache-python-ssl.outputs.cache-hit != 'true' |
157 | 160 | | with: |
158 | 161 | | arch: ${{ matrix.arch }} |
| 162 | + | |
| 163 | + | - name: Windows Choco Packages Install |
| 164 | + | if: runner.os == 'Windows' |
| 165 | + | run: | |
| 166 | + | choco install sqlite $CHOCO_OPS |
159 | 167 | | |
160 | 168 | | - name: Windows NASM Install |
161 | 169 | | uses: ilammy/setup-nasm@v1 |
| skipped 321 lines |