Skip to content

Commit

Permalink
Merge branch 'master' into feature/cmake-build-args
Browse files Browse the repository at this point in the history
  • Loading branch information
cottsay committed Dec 6, 2021
2 parents fec5892 + 511712c commit 013736d
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 34 deletions.
31 changes: 31 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Run tests

on:
push:
branches: ['master']
pull_request:

jobs:
setup:
runs-on: ubuntu-latest
outputs:
strategy: ${{steps.load.outputs.strategy}}

steps:
- uses: actions/checkout@v2
with:
repository: colcon/ci
- id: load
run: echo "::set-output name=strategy::$(echo $(cat strategy.json))"

pytest:
needs: [setup]
strategy: ${{fromJson(needs.setup.outputs.strategy)}}
runs-on: ${{matrix.os}}

steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: ${{matrix.python}}
- uses: colcon/ci@v1
16 changes: 0 additions & 16 deletions .travis.yml

This file was deleted.

15 changes: 0 additions & 15 deletions appveyor.yml

This file was deleted.

13 changes: 10 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ install_requires =
colcon-library-path
colcon-test-result>=0.3.3
packages = find:
tests_require =
zip_safe = true

[options.extras_require]
test =
flake8>=3.6.0
flake8-blind-except
flake8-builtins
Expand All @@ -46,13 +49,14 @@ tests_require =
pytest
pytest-cov
scspell3k>=2.2
zip_safe = true

[tool:pytest]
filterwarnings =
error
# Suppress deprecation warning in flake8
# Suppress deprecation warnings in other packages
ignore:lib2to3 package is deprecated::scspell
ignore:SelectableGroups dict interface is deprecated::flake8
ignore:Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated::pyreadline
junit_suite_name = colcon-cmake

[options.entry_points]
Expand All @@ -77,3 +81,6 @@ colcon_test_result.test_result =

[flake8]
import-order-style = google

[coverage:run]
source = colcon_cmake

0 comments on commit 013736d

Please sign in to comment.