Skip to content

github: keep yangtze's runs working #6473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/python-nosetests-3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

set -uex

sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ trusty main universe"
sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ jammy main universe"
sudo apt-get update
sudo apt-get install -y python3-mock python3-nose
pip3 install mock
Expand Down
7 changes: 3 additions & 4 deletions .github/python-nosetests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@

set -uex

sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ trusty main universe"
sudo apt-get update
sudo apt-get install -y python-mock python-nose
curl https://bootstrap.pypa.io/pip/2.7/get-pip.py |sudo python2
pip install enum
sudo apt-get install python2
curl https://bootstrap.pypa.io/pip/2.7/get-pip.py | sudo python2
pip install enum nose mock

nosetests scripts scripts/examples scripts/examples/python
PYTHONPATH=scripts/plugins python2 -m unittest -v test_extauth_hook_AD
4 changes: 2 additions & 2 deletions .github/workflows/1.249-lcm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
python-test:
name: Python tests
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand All @@ -21,7 +21,7 @@ jobs:

ocaml-test:
name: Ocaml tests
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
ocaml-format:
name: Ocaml files
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Checkout code
Expand Down
6 changes: 5 additions & 1 deletion scripts/test_usb_scan.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
#
# unittest for usb_scan.py

from collections import Mapping, Container, Iterable
try:
from collections import Mapping, Container, Iterable
except:
from collections.abc import Mapping, Container, Iterable

import mock
from nose.tools import nottest
import os
Expand Down
Loading