Skip to content

Commit

Permalink
fix Sanity test output capture
Browse files Browse the repository at this point in the history
  • Loading branch information
fredericlepied committed Dec 19, 2023
1 parent 31a9903 commit ce4cf41
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ jobs:
export PYTHONHASHSEED=42
git checkout -b branch
git fetch --unshallow origin main
cmd="ansible-lint --parseable --nocolor --profile=shared"
cmd="ansible-lint --parseable --color --profile=shared"
# don't want to annotate through GHA
unset GITHUB_ACTIONS
$cmd > branch.output || echo "Branch linting output written"
$cmd | tee branch.output || echo "Branch linting output written"
git checkout main
$cmd > main.output || echo "Main linting output written"
export GITHUB_ACTIONS=true
Expand Down Expand Up @@ -89,11 +89,11 @@ jobs:
git fetch --unshallow origin main
for version in 3.6 3.7 3.8 3.9 ; do
ansible-test sanity --verbose --docker --python $version --color --coverage --failure-ok
done 2>&1 | tee branch.output
done 2>&1 | tee -a branch.output
git checkout main
for version in 3.6 3.7 3.8 3.9 ; do
ansible-test sanity --verbose --docker --python $version --color --coverage --failure-ok
done > main.output 2>&1
done >> main.output 2>&1
for key in branch main; do
grep -E "(ERROR|FATAL):" "$key.output" |
grep -v "issue(s) which need to be resolved\|See error output above for details." |
Expand All @@ -118,8 +118,6 @@ jobs:
name: "Check all dependencies are merged"
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Check all dependent Pull Requests are merged
uses: depends-on/depends-on-action@main
Expand Down

0 comments on commit ce4cf41

Please sign in to comment.