Skip to content

Commit 69f7f04

Browse files
committed
Try to fix functional tests
1 parent 74f5e85 commit 69f7f04

3 files changed

Lines changed: 23 additions & 5 deletions

File tree

.github/workflows/linux_tests.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@ jobs:
3636
persist-credentials: false
3737
- run: |
3838
sudo apt-get update
39-
sudo apt-get install -y $(./scripts/linux/getdeps.py -a linux/debian/control) ccache
39+
sudo apt-get install -y $(./scripts/linux/getdeps.py --build --no-qt) ccache
40+
41+
- name: Setup Qt for Linux
42+
id: setup-qt
43+
uses: ./.github/actions/qt-setup-taskcluster
4044

4145
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
4246
with:
@@ -122,7 +126,7 @@ jobs:
122126
- name: Install test dependecies
123127
run: |
124128
sudo apt-get update
125-
sudo apt-get install -y $(./scripts/linux/getdeps.py -r linux/debian/control)
129+
sudo apt-get install -y $(./scripts/linux/getdeps.py --runtime --no-qt)
126130
sudo apt install --no-upgrade firefox xvfb -y
127131
chmod +x build-${{ runner.os }}/src/mozillavpn
128132

.github/workflows/test_unit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Install dependences
3030
run: |
3131
sudo apt-get update
32-
sudo apt-get install -y $(./scripts/linux/getdeps.py -a linux/debian/control | grep -vE '^(qml6|libqt6|qt6)')
32+
sudo apt-get install -y $(./scripts/linux/getdeps.py --all --no-qt)
3333
3434
- name: Setup Qt for Linux
3535
id: setup-qt

scripts/linux/getdeps.py

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
help='List packages from the Depends paragraph')
1414
parser.add_argument('-a', '--all', action='store_true',
1515
help='List all packages dependencies')
16+
parser.add_argument('-n', '--no-qt', action='store_true',
17+
help='Ignore Qt package dependencies')
1618
args = parser.parse_args()
1719

1820
## If no control file was provided, assume control.qt6 from the source checkout.
@@ -32,9 +34,21 @@
3234
# Parse the control file to dump the package dependencies.
3335
def dump(depends):
3436
for dep in depends.split(','):
35-
if dep.startswith('$'):
37+
pkg = dep.split()[0]
38+
if pkg.startswith('$'):
3639
continue
37-
print(dep.split()[0])
40+
41+
if args.no_qt:
42+
if pkg.startswith('qml6'):
43+
continue
44+
if pkg.startswith('qt6'):
45+
continue
46+
if pkg.startswith('libqt6'):
47+
continue
48+
if pkg.startswith('qmake'):
49+
continue
50+
51+
print(pkg)
3852

3953
for p in Deb822.iter_paragraphs(open(args.control)):
4054
for item in p.items():

0 commit comments

Comments
 (0)