Skip to content

Commit 4fd2653

Browse files
committed
install xvfb directly, call during tests
1 parent 7831e66 commit 4fd2653

File tree

1 file changed

+12
-15
lines changed

1 file changed

+12
-15
lines changed

.github/workflows/smoke.yml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,8 @@ jobs:
249249
run: |
250250
echo "MANUAL='true'" >> "$GITHUB_ENV";
251251
echo "Running smoke tests on supplied executable";
252-
uname -m
252+
uname -m;
253+
apt install xvfb;
253254
mkdir -p artifacts;
254255
pip3 install 'pipenv==2023.11.15';
255256
pip3 install 'ruff>=0.4.8,<0.5';
@@ -261,26 +262,22 @@ jobs:
261262
#. ./keyring-unlock.sh;
262263
- name: Run Smoke Tests in Ubuntu
263264
if: steps.setup.conclusion == 'success'
264-
uses: coactions/setup-xvfb@v1
265265
env:
266266
FX_EXECUTABLE: ./firefox/firefox
267-
with:
268-
run: |
269-
"$FX_EXECUTABLE" --version
270-
pipenv run python choose_ci_set.py
271-
pipenv run pytest --fx-executable="$FX_EXECUTABLE" -n 4 $(cat selected_tests) || TEST_EXIT_CODE=$?
272-
exit $TEST_EXIT_CODE
267+
run: |
268+
"$FX_EXECUTABLE" --version
269+
pipenv run python choose_ci_set.py
270+
Xvfb :99 & DISPLAY=:99 pipenv run pytest --fx-executable="$FX_EXECUTABLE" -n 4 $(cat selected_tests) || TEST_EXIT_CODE=$?
271+
exit $TEST_EXIT_CODE
273272
- name: Run Smoke Tests in Ubuntu (Headed)
274273
if: steps.setup.conclusion == 'success' && always()
275-
uses: coactions/setup-xvfb@v1
276274
env:
277275
FX_EXECUTABLE: ./firefox/firefox
278-
with:
279-
run: |
280-
mv ./ci_pyproject_headed.toml ./pyproject.toml;
281-
pipenv run python choose_ci_set.py
282-
pipenv run pytest --fx-executable="$FX_EXECUTABLE" $(cat selected_tests) || TEST_EXIT_CODE=$?
283-
exit $TEST_EXIT_CODE
276+
run: |
277+
mv ./ci_pyproject_headed.toml ./pyproject.toml;
278+
pipenv run python choose_ci_set.py
279+
Xvfb :99 & DISPLAY=:99 pipenv run pytest --fx-executable="$FX_EXECUTABLE" $(cat selected_tests) || TEST_EXIT_CODE=$?
280+
exit $TEST_EXIT_CODE
284281
285282
Use-Artifacts:
286283
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)