Skip to content

Commit

Permalink
Merge pull request #249 from qzhuyan/code-format-2023-year-end
Browse files Browse the repository at this point in the history
Code format 2023 year end
  • Loading branch information
qzhuyan authored Dec 19, 2023
2 parents 09a60d3 + 40d04b6 commit 3d3e48f
Show file tree
Hide file tree
Showing 32 changed files with 10,698 additions and 8,524 deletions.
13 changes: 0 additions & 13 deletions .github/workflows/code-format.yaml

This file was deleted.

21 changes: 21 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,28 @@ name: ci
on: [push, pull_request]

jobs:
formatting-check:
name: Formatting Check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Run clang-format style check for C/C++/Protobuf programs.
uses: jidicula/[email protected]
with:
clang-format-version: '13'
check-path: 'c_src'
- name: Prepare OTP and rebar3
uses: erlef/setup-beam@v1
with:
otp-version: 26
rebar3-version: 3.20.0
- name: Run erlfmt for erlang code
run: |
rebar3 fmt -c
mac:
timeout-minutes: 60
needs: formatting-check
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -58,6 +78,7 @@ jobs:


linux:
needs: formatting-check
runs-on: ubuntu-22.04
timeout-minutes: 25
strategy:
Expand Down
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ compile:
.PHONY: clean
clean: distclean


fmt:
rebar3 fmt


.PHONY: distclean
distclean:
$(REBAR) unlock --all
Expand Down
2 changes: 1 addition & 1 deletion include/quicer.hrl
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
%% See the License for the specific language governing permissions and
%% limitations under the License.
%%--------------------------------------------------------------------

%%% % @noformat
-ifndef(QUICER_HRL).
-define(QUICER_HRL, true).

Expand Down
Loading

0 comments on commit 3d3e48f

Please sign in to comment.