Skip to content

Commit c94438a

Browse files
committed
Fix testing wheel
1 parent 5a8f9c0 commit c94438a

File tree

1 file changed

+18
-20
lines changed

1 file changed

+18
-20
lines changed

.github/workflows/on-push.yml

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -292,32 +292,31 @@ jobs:
292292
with:
293293
python-version: ${{ matrix.python-version }}
294294
cache: 'pip'
295-
- name: Install Robot Framework Browser on unix-like
296-
if: matrix.os != 'windows-latest'
295+
- name: Install Robot Framework Browser
297296
run: |
298297
pip install uv
299298
uv pip install ./robotframework_browser-*-py3-none-any.whl --python ${{ matrix.python-version }} --system
300299
- name: Install Robot Framework BrowserBatteries on unix-like
301-
if: matrix.os != 'windows-latest' && matrix.node-version == '20.x'
300+
if: matrix.node-version == '22.x'
302301
run: |
303302
uv pip install ./robotframework_browser_batteries-*-none-any.whl --python ${{ matrix.python-version }} --system
304303
- name: Install node deps and python deps for test running
305304
run: |
306305
rfbrowser init
307306
uv pip install wheel --python ${{ matrix.python-version }} --system
308307
uv pip install -r Browser/dev-requirements.txt --python ${{ matrix.python-version }} --system
309-
- name: Test on unix-like os - serial mode - Browser
310-
if: matrix.os == 'ubuntu-latest'
308+
- name: Test on unix-like os - serial mode - BrowserBatteries
309+
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '22.x'
311310
env:
312311
SYS_VAR_CI_INSTALL_TEST: 1
313312
run: |
314313
echo ${{ matrix.os }}
315314
rm -rf Browser
316315
export DISPLAY=:99.0
317316
Xvfb -ac :99 -screen 0 1280x1024x16 > /dev/null 2>&1 &
318-
xvfb-run --auto-servernum invoke atest-robot --smoke
319-
- name: Test on unix-like os - serial mode - BrowserBatteries
320-
if: matrix.os == 'ubuntu-latest'
317+
xvfb-run --auto-servernum invoke atest-robot --smoke --batteries
318+
- name: Test on unix-like os - serial mode - Browse
319+
if: matrix.os == 'ubuntu-latest' && matrix.node-version != '22.x'
321320
env:
322321
SYS_VAR_CI_INSTALL_TEST: 1
323322
run: |
@@ -326,32 +325,31 @@ jobs:
326325
export DISPLAY=:99.0
327326
Xvfb -ac :99 -screen 0 1280x1024x16 > /dev/null 2>&1 &
328327
xvfb-run --auto-servernum invoke atest-robot --smoke --batteries
329-
- name: Run Robot Framework tests on windows or macOS Browser
330-
if: ${{ matrix.os != 'ubuntu-latest' }}
328+
- name: Run Robot Framework tests on windows or macOS BrowserBatteries
329+
if: ${{ matrix.os != 'ubuntu-latest' }} && matrix.node-version == '22.x'
331330
env:
332331
SYS_VAR_CI_INSTALL_TEST: 1
333332
run: |
334-
echo ${{ matrix.os }}
335333
Remove-Item -Path .\Browser -Force -Recurse
336334
invoke atest-robot --smoke
337-
- name: Run Robot Framework tests on windows or macOS BrowserBatteries
338-
if: ${{ matrix.os != 'ubuntu-latest' }}
335+
- name: Run Robot Framework tests on windows or macOS Browser
336+
if: ${{ matrix.os != 'ubuntu-latest' }} && matrix.node-version != '22.x'
339337
env:
340338
SYS_VAR_CI_INSTALL_TEST: 1
341339
run: |
342-
echo ${{ matrix.os }}
343340
Remove-Item -Path .\Browser -Force -Recurse
344-
invoke atest-robot --smoke --batteries
345-
- name: Uninstall on Linux or MacOS
346-
if: ${{ matrix.os != 'windows-latest' }}
341+
invoke atest-robot --smoke
342+
- name: Uninstall Browser and BrowserBatteries
343+
if: matrix.node-version == '22.x'
347344
run: |
348345
rfbrowser clean-node
349346
uv pip uninstall robotframework-browser --python ${{ matrix.python-version }} --system
350-
- name: Uninstall BrowserBatteries on Linux or MacOS
351-
if: ${{ matrix.os != 'windows-latest' }}
347+
uv pip uninstall robotframework-browser-batteries --python ${{ matrix.python-version }} --system
348+
- name: Uninstall Browser
349+
if: matrix.node-version != '22.x'
352350
run: |
353351
rfbrowser clean-node
354-
uv pip uninstall robotframework-browser-batteries --python ${{ matrix.python-version }} --system
352+
uv pip uninstall robotframework-browser --python ${{ matrix.python-version }} --system
355353
- uses: actions/upload-artifact@v4
356354
if: ${{ always() }}
357355
with:

0 commit comments

Comments
 (0)