diff --git a/.github/workflows/fedora_41.yml b/.github/workflows/fedora_41.yml index 5f252cb27..53010be1e 100644 --- a/.github/workflows/fedora_41.yml +++ b/.github/workflows/fedora_41.yml @@ -104,7 +104,7 @@ jobs: git submodule update --init --recursive source /home/wxpy/venvs/Py314/bin/activate pip install . - xvfb-run --server-args="-screen 0, 1280x720x24" -a ride.py & + xvfb-run --server-args="-screen 0, 1280x720x24" -a ride & sleep 10 killall xvfb-run diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 964dc42a4..4289b0617 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -60,7 +60,7 @@ on: jobs: fedora: name: Fedora py313 - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest if: ${{ !contains(github.ref, '/debian/') }} container: image: fedora:41 @@ -92,13 +92,13 @@ jobs: run: | git submodule update --init --recursive pip install . - xvfb-run --server-args="-screen 0, 1280x720x24" -a ride.py & + xvfb-run --server-args="-screen 0, 1280x720x24" -a ride & sleep 10 killall xvfb-run debian: name: Debian - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest strategy: fail-fast: false if: ${{ !contains(github.ref, '/fedora/') }} @@ -113,12 +113,10 @@ jobs: - name: Setup environment run: | sudo apt update -y - sudo apt install -y libsdl1.2debian libsdl2-2.0-0 libnotify4 + sudo apt install -y libsdl1.2debian libsdl2-2.0-0 libnotify4 wxpython-tools git submodule update --init --recursive - pip install https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04/wxPython-4.2.1-cp310-cp310-linux_x86_64.whl pip install -r requirements-dev.txt pip install robotframework - pip install --force -U setuptools==69.5.1 - name: Run tests run: | Xvfb & @@ -137,7 +135,9 @@ jobs: - name: Install and run run: | git submodule update --init --recursive + pip install -r requirements-dev.txt + pip install robotframework pip install . - xvfb-run --server-args="-screen 0, 1280x720x24" -a ride.py & + xvfb-run --server-args="-screen 0, 1280x720x24" -a ride & sleep 10 killall xvfb-run diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index 98171ae81..d989bf2e9 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -8,7 +8,7 @@ on: jobs: sonarcloud: name: SonarCloud - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 with: @@ -16,7 +16,7 @@ jobs: - name: Update ubuntu run: sudo apt update -y - name: Install missing library - run: sudo apt-get install libnotify4 libsdl1.2debian libsdl2.2 -y + run: sudo apt-get install libnotify4 libsdl1.2debian libsdl2.2 wxpython-tools -y - name: Install xorg run: sudo apt-get install -y xorg openbox - name: Install Xvfb @@ -27,18 +27,18 @@ jobs: python-version: ${{ matrix.python }} - name: Install invoke and any other packages run: pip install coverage invoke pytest - - name: Install wxPython - run: pip install https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04/wxPython-4.2.1-cp310-cp310-linux_x86_64.whl - name: Install RIDE dependencies run: | git submodule update --init --recursive pip install -r requirements-dev.txt - pip install --force -U setuptools==69.5.1 + pip install robotframework - name: Run Xvfb run: Xvfb :1 -noreset & - name: Test Install RIDE run: | git submodule update --init --recursive + pip install -r requirements-dev.txt + pip install robotframework pip install . - name: Run RIDE unit-tests run: | diff --git a/requirements-dev.txt b/requirements-dev.txt index 97e0c619b..cd5220421 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,4 +1,4 @@ -setuptools>=70.0.0 +setuptools>=78.1.1 build mockito invoke @@ -12,6 +12,7 @@ pytest coverage pytest-cov pytest-order +packaging >= 24.2 # To make a relase you need asciidoc3 (a2x3) # asciidoc3 # Include also normal project requirements.