Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Uncrustify version issue fix #815

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,12 @@ jobs:
formatting:
# Use only 18.04 since we want the uncrustify version to
# be 0.66.1_f to ensure proper formatting.
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
container: ubuntu:18.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install Uncrustify
run: sudo apt-get install uncrustify
run: apt-get update && apt-get install uncrustify
- name: Run Uncrustify
run: |
uncrustify --version
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/uncrustify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ jobs:
Uncrustify:
name: Run_Uncrustify
if: ${{ github.event.issue.pull_request && github.event.comment.body == '/bot run uncrustify' }}
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
container: ubuntu:18.04
steps:
- name: Dump GitHub context
env:
Expand All @@ -29,17 +30,16 @@ jobs:
run: |
echo ${{ steps.upstreamrepo.outputs.RemoteRepo }}:${{ steps.upstreambranch.outputs.branchname }}
- name: Checkout upstream repo
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: ${{ steps.upstreamrepo.outputs.RemoteRepo }}
ref: ${{ steps.upstreambranch.outputs.branchname }}
- name: Install Uncrustify
run: sudo apt-get install uncrustify
run: apt-get update && apt-get install uncrustify
- name: Run Uncrustify
run: |
uncrustify --version
find . -iname "*.[hc]" -exec uncrustify -c tools/uncrustify.cfg --no-backup --replace {} +
find . -iname "*.[hc]" -exec uncrustify -c tools/uncrustify.cfg --no-backup --replace {} +
- name: Push changes to upstream repository
run: |
git config --global user.name 'GitHub Action'
Expand Down