Skip to content

Commit

Permalink
Merge branch 'master' into feature/fish_shell_support
Browse files Browse the repository at this point in the history
  • Loading branch information
cottsay committed Aug 29, 2023
2 parents 278d2ec + e442ce5 commit c7c79af
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@ jobs:
strategy: ${{steps.load.outputs.strategy}}

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

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

steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: ${{matrix.python}}
- uses: colcon/ci@v1
1 change: 1 addition & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ filterwarnings =
error
# Suppress deprecation warnings in other packages
ignore:lib2to3 package is deprecated::scspell
ignore:pkg_resources is deprecated as an API::flake8_import_order
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-cd
Expand Down

0 comments on commit c7c79af

Please sign in to comment.