Skip to content

Commit 2eddea9

Browse files
committed
Merge branch 'master' into cottsay/git-ls-remote-stderr
2 parents 583875d + 7e2b148 commit 2eddea9

File tree

2 files changed

+15
-29
lines changed

2 files changed

+15
-29
lines changed

.github/workflows/ci.yaml

Lines changed: 15 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,21 @@
1-
name: rosdistro-ci
1+
---
2+
name: Run tests
23

3-
on:
4+
on: # yamllint disable-line rule:truthy
45
push:
5-
branches: [master]
6+
branches: ['master']
67
pull_request:
78

89
jobs:
9-
build:
10-
strategy:
11-
matrix:
12-
os: [ubuntu-latest, macos-latest]
13-
python: ['3.7', '3.8', '3.9', '3.10']
14-
include:
15-
- os: ubuntu-18.04
16-
python: '2.7'
17-
- os: ubuntu-18.04
18-
python: '3.6'
19-
name: rosdistro tests
20-
runs-on: ${{matrix.os}}
21-
10+
pytest:
11+
uses: ros-infrastructure/ci/.github/workflows/pytest.yaml@main
12+
with:
13+
matrix-filter: del(.matrix.os[] | select(contains("windows")))
14+
yamllint:
15+
runs-on: ubuntu-latest
2216
steps:
23-
- uses: actions/checkout@v2
24-
- name: Set up Python ${{matrix.python}}
25-
uses: actions/setup-python@v2
26-
with:
27-
python-version: ${{matrix.python}}
28-
- name: Install dependencies
29-
run: |
30-
python -m pip install -U -e .[test] pytest-cov -c constraints.txt
31-
- name: Run tests
32-
run: |
33-
python -m pytest test --cov
17+
- uses: actions/checkout@v4
18+
- run: >-
19+
yamllint .
20+
-f github
21+
-d '{extends: default, ignore: [test/files/foo/*.yaml]}'

constraints.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)