Skip to content

Commit 4c70538

Browse files
committed
Revert "Combine environment setting steps into one step with shell script (#1010)"
This reverts commit 5ccf419.
1 parent 059dbac commit 4c70538

File tree

4 files changed

+199
-130
lines changed

4 files changed

+199
-130
lines changed

.github/workflows/desktop.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,10 @@ 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
315319
- name: Cache vcpkg C++ dependencies
316320
id: cache_vcpkg
317321
uses: actions/cache@v2
@@ -328,12 +332,11 @@ jobs:
328332
with:
329333
python-version: ${{ fromJson(needs.prepare_matrix.outputs.matrix_python_version)[0] }}
330334
- name: Prepare for integration tests
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'
335+
run: |
336+
pip install -r scripts/gha/requirements.txt
337+
- name: Install OpenSSL
338+
run: |
339+
sudo apt install openssl
337340
- name: Build integration tests
338341
shell: bash
339342
env:

0 commit comments

Comments
 (0)