Skip to content

Commit

Permalink
Merge branch 'TeeworldsBotLib:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
ChillerDragon authored May 19, 2024
2 parents 4f43afc + ef8b365 commit f7838cb
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 13 deletions.
17 changes: 6 additions & 11 deletions .github/workflows/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,25 @@ name: Check style

on:
push:
branches-ignore:
- gh-readonly-queue/**
- master
pull_request:
merge_group:

jobs:
check-style:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
strategy:
fail-fast: false
steps:
- uses: actions/checkout@v4
with:
submodules: true
- name: Prepare
run: |
sudo apt-get update -y
sudo apt-get install -y pkg-config cmake cmake build-essential shellcheck
- name: Install clang-format
sudo apt-get install -y pkg-config cmake cmake build-essential shellcheck clang-format
- name: Check clang format version
run: |
wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
sudo ./llvm.sh 19
sudo apt-get install clang-format-19
clang-format -version
clang-format -version # expect 10
- name: Check fix_style
run: scripts/fix_style.py --dry-run
# - name: Shellcheck
Expand Down
2 changes: 1 addition & 1 deletion src/server/set_state.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ void SetState(const CCharacter *pChr, CServerBotStateIn *pState)
pState->m_VelY = pChr->Core()->m_Vel.y;
}

}
} // namespace TWBL

#endif
1 change: 0 additions & 1 deletion src/test/sample.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,3 @@ int main()
EXPECT_STREQ(Bot.m_pDirFunction, "SampleTick");
EXPECT_EQ(Bot.m_DirLine, 9);
}

0 comments on commit f7838cb

Please sign in to comment.