Skip to content

[Bugfix] Windows openssl build #1033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 19, 2022
Merged

[Bugfix] Windows openssl build #1033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d1c659f
Revert "Revert "Combine environment setting steps into one step with …
sunmou99 Jul 18, 2022
5ad2bc1
install openssl for windows
sunmou99 Jul 18, 2022
9a7f716
force install openssl for windows
sunmou99 Jul 18, 2022
9f3af3e
Merge branch 'main' into revert-1029-rollback-pr-1010
sunmou99 Jul 19, 2022
4d542b5
update name python_requirements.txt
sunmou99 Jul 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/checks_secure.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
python-version: 3.7
- name: Install prerequisites
if: steps.check.outputs.has-permission != 1 || github.event.pull_request.head.repo.full_name != github.repository
run: pip install -r scripts/gha/requirements.txt
run: pip install -r scripts/gha/python_requirements.txt
- name: Dismiss reviews
if: steps.check.outputs.has-permission != 1 || github.event.pull_request.head.repo.full_name != github.repository
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cpp-packaging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,7 @@ jobs:
- name: Use GitHub API to start workflow
shell: bash
run: |
pip install -r scripts/gha/requirements.txt
pip install -r scripts/gha/python_requirements.txt
if [[ -z ${USE_EXPANDED_MATRIX} ]]; then
USE_EXPANDED_MATRIX=0
fi
Expand Down
15 changes: 6 additions & 9 deletions .github/workflows/desktop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,10 +312,6 @@ jobs:
with:
ref: ${{needs.check_and_prepare.outputs.github_ref}}
submodules: true
- name: Set env vars
run: |
echo "VCPKG_TRIPLET=x64-linux" >> $GITHUB_ENV
echo "VCPKG_RESPONSE_FILE=external/vcpkg_${{ env.VCPKG_TRIPLET }}_response_file.txt" >> $GITHUB_ENV
- name: Cache vcpkg C++ dependencies
id: cache_vcpkg
uses: actions/cache@v2
Expand All @@ -332,11 +328,12 @@ jobs:
with:
python-version: ${{ fromJson(needs.prepare_matrix.outputs.matrix_python_version)[0] }}
- name: Prepare for integration tests
run: |
pip install -r scripts/gha/requirements.txt
- name: Install OpenSSL
run: |
sudo apt install openssl
uses: nick-invision/retry@v2
with:
shell: bash
timeout_minutes: 15
max_attempts: 3
command: scripts/gha/install_test_workflow_prereqs.sh -p Desktop -a 'x64' -s 'openssl'
- name: Build integration tests
shell: bash
env:
Expand Down
Loading