Skip to content

Commit e5d8e62

Browse files
Improve Workflows (#2953)
* devops: fix workflows and dependency * devops: fix workflows in Unbuntu * devops: fix typo in workflows in Unbuntu * devops: pin version of packaging because failed workflows in Unbuntu * devops: use ubuntu-latest and install wxpython-tools for workflows in Unbuntu
1 parent 9ea98c1 commit e5d8e62

File tree

4 files changed

+15
-14
lines changed

4 files changed

+15
-14
lines changed

.github/workflows/fedora_41.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
git submodule update --init --recursive
105105
source /home/wxpy/venvs/Py314/bin/activate
106106
pip install .
107-
xvfb-run --server-args="-screen 0, 1280x720x24" -a ride.py &
107+
xvfb-run --server-args="-screen 0, 1280x720x24" -a ride &
108108
sleep 10
109109
killall xvfb-run
110110

.github/workflows/linux.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ on:
6060
jobs:
6161
fedora:
6262
name: Fedora py313
63-
runs-on: ubuntu-22.04
63+
runs-on: ubuntu-latest
6464
if: ${{ !contains(github.ref, '/debian/') }}
6565
container:
6666
image: fedora:41
@@ -92,13 +92,13 @@ jobs:
9292
run: |
9393
git submodule update --init --recursive
9494
pip install .
95-
xvfb-run --server-args="-screen 0, 1280x720x24" -a ride.py &
95+
xvfb-run --server-args="-screen 0, 1280x720x24" -a ride &
9696
sleep 10
9797
killall xvfb-run
9898
9999
debian:
100100
name: Debian
101-
runs-on: ubuntu-22.04
101+
runs-on: ubuntu-latest
102102
strategy:
103103
fail-fast: false
104104
if: ${{ !contains(github.ref, '/fedora/') }}
@@ -113,12 +113,10 @@ jobs:
113113
- name: Setup environment
114114
run: |
115115
sudo apt update -y
116-
sudo apt install -y libsdl1.2debian libsdl2-2.0-0 libnotify4
116+
sudo apt install -y libsdl1.2debian libsdl2-2.0-0 libnotify4 wxpython-tools
117117
git submodule update --init --recursive
118-
pip install https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04/wxPython-4.2.1-cp310-cp310-linux_x86_64.whl
119118
pip install -r requirements-dev.txt
120119
pip install robotframework
121-
pip install --force -U setuptools==69.5.1
122120
- name: Run tests
123121
run: |
124122
Xvfb &
@@ -137,7 +135,9 @@ jobs:
137135
- name: Install and run
138136
run: |
139137
git submodule update --init --recursive
138+
pip install -r requirements-dev.txt
139+
pip install robotframework
140140
pip install .
141-
xvfb-run --server-args="-screen 0, 1280x720x24" -a ride.py &
141+
xvfb-run --server-args="-screen 0, 1280x720x24" -a ride &
142142
sleep 10
143143
killall xvfb-run

.github/workflows/sonar.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ on:
88
jobs:
99
sonarcloud:
1010
name: SonarCloud
11-
runs-on: ubuntu-22.04
11+
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v3
1414
with:
1515
fetch-depth: 0
1616
- name: Update ubuntu
1717
run: sudo apt update -y
1818
- name: Install missing library
19-
run: sudo apt-get install libnotify4 libsdl1.2debian libsdl2.2 -y
19+
run: sudo apt-get install libnotify4 libsdl1.2debian libsdl2.2 wxpython-tools -y
2020
- name: Install xorg
2121
run: sudo apt-get install -y xorg openbox
2222
- name: Install Xvfb
@@ -27,18 +27,18 @@ jobs:
2727
python-version: ${{ matrix.python }}
2828
- name: Install invoke and any other packages
2929
run: pip install coverage invoke pytest
30-
- name: Install wxPython
31-
run: pip install https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04/wxPython-4.2.1-cp310-cp310-linux_x86_64.whl
3230
- name: Install RIDE dependencies
3331
run: |
3432
git submodule update --init --recursive
3533
pip install -r requirements-dev.txt
36-
pip install --force -U setuptools==69.5.1
34+
pip install robotframework
3735
- name: Run Xvfb
3836
run: Xvfb :1 -noreset &
3937
- name: Test Install RIDE
4038
run: |
4139
git submodule update --init --recursive
40+
pip install -r requirements-dev.txt
41+
pip install robotframework
4242
pip install .
4343
- name: Run RIDE unit-tests
4444
run: |

requirements-dev.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
setuptools>=70.0.0
1+
setuptools>=78.1.1
22
build
33
mockito
44
invoke
@@ -12,6 +12,7 @@ pytest
1212
coverage
1313
pytest-cov
1414
pytest-order
15+
packaging >= 24.2
1516
# To make a relase you need asciidoc3 (a2x3)
1617
# asciidoc3
1718
# Include also normal project requirements.

0 commit comments

Comments
 (0)