Skip to content

Commit

Permalink
Merge pull request #39889 from ifreund/github-actions-astyle
Browse files Browse the repository at this point in the history
Run astyle on the github actions CI
  • Loading branch information
kevingranade authored Apr 25, 2020
2 parents d73416c + c043670 commit f47f2ee
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 2 deletions.
27 changes: 27 additions & 0 deletions .github/workflows/astyle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: astyle

on:
pull_request

jobs:
style-json:
name: astyle check

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
with:
fetch-depth: 10

- name: install dependencies
run: sudo apt-get install astyle

- name: astyle check
run: make astyle-check

- name: Display Corrections
if: failure()
run: |
make astyle
git diff
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,12 @@ jobs:
sources: [*apt_sources]

- env: COMPILER=g++-8 CXXFLAGS="-Wno-implicit-fallthrough" TILES=1 SOUND=1 SANITIZE=address EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency"
name: "GCC 8 Make build with Tiles, Sound, astyle and address sanitization"
name: "GCC 8 Make build with Tiles, Sound and address sanitization"
dist: bionic
compiler: gcc
addons: &gcc8
apt:
packages: ["g++-8", "g++-8-multilib", "libc6-dbg", "libc6-dbg:i386", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev", "astyle"]
packages: ["g++-8", "g++-8-multilib", "libc6-dbg", "libc6-dbg:i386", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev"]
sources: *apt_sources

- env: CLANG=clang++-8 SANITIZE=address,undefined EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency ~vehicle_drag ~starting_items ~[starve] ~grenade_lethality"
Expand Down

0 comments on commit f47f2ee

Please sign in to comment.