Skip to content

Commit 584564f

Browse files
authored
[Bugfix] Windows openssl build (#1033)
1 parent 912e979 commit 584564f

7 files changed

+136
-203
lines changed

.github/workflows/checks_secure.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
python-version: 3.7
3535
- name: Install prerequisites
3636
if: steps.check.outputs.has-permission != 1 || github.event.pull_request.head.repo.full_name != github.repository
37-
run: pip install -r scripts/gha/requirements.txt
37+
run: pip install -r scripts/gha/python_requirements.txt
3838
- name: Dismiss reviews
3939
if: steps.check.outputs.has-permission != 1 || github.event.pull_request.head.repo.full_name != github.repository
4040
shell: bash

.github/workflows/cpp-packaging.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,7 @@ jobs:
786786
- name: Use GitHub API to start workflow
787787
shell: bash
788788
run: |
789-
pip install -r scripts/gha/requirements.txt
789+
pip install -r scripts/gha/python_requirements.txt
790790
if [[ -z ${USE_EXPANDED_MATRIX} ]]; then
791791
USE_EXPANDED_MATRIX=0
792792
fi

.github/workflows/desktop.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -312,10 +312,6 @@ jobs:
312312
with:
313313
ref: ${{needs.check_and_prepare.outputs.github_ref}}
314314
submodules: true
315-
- name: Set env vars
316-
run: |
317-
echo "VCPKG_TRIPLET=x64-linux" >> $GITHUB_ENV
318-
echo "VCPKG_RESPONSE_FILE=external/vcpkg_${{ env.VCPKG_TRIPLET }}_response_file.txt" >> $GITHUB_ENV
319315
- name: Cache vcpkg C++ dependencies
320316
id: cache_vcpkg
321317
uses: actions/cache@v2
@@ -332,11 +328,12 @@ jobs:
332328
with:
333329
python-version: ${{ fromJson(needs.prepare_matrix.outputs.matrix_python_version)[0] }}
334330
- name: Prepare for integration tests
335-
run: |
336-
pip install -r scripts/gha/requirements.txt
337-
- name: Install OpenSSL
338-
run: |
339-
sudo apt install openssl
331+
uses: nick-invision/retry@v2
332+
with:
333+
shell: bash
334+
timeout_minutes: 15
335+
max_attempts: 3
336+
command: scripts/gha/install_test_workflow_prereqs.sh -p Desktop -a 'x64' -s 'openssl'
340337
- name: Build integration tests
341338
shell: bash
342339
env:

0 commit comments

Comments
 (0)