Skip to content

Commit

Permalink
Merge pull request #257 from mochi/fix-edoc
Browse files Browse the repository at this point in the history
Fix rebar edoc and test in CI
  • Loading branch information
etrepum authored Apr 20, 2023
2 parents 666ac57 + 5bd8411 commit 0733494
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 7 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,16 @@ jobs:
os:
- ubuntu-latest
otp:
- "25.1.1"
- "24.3.4.0"
- "23.3.4.14"
- "25.3.0.0"
- "24.3.4.10"
- "23.3.4.18"
- "22.3.4.26"
- "21.3.8.24"
- "20.3.8.26"
- "19.3.6.13"
- "18.3.4.11"
steps:
- uses: actions/checkout@v2.3.2
- uses: actions/checkout@v3
- run: make test
- run: make edoc
- run: REBAR=rebar make test
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Publish to Hex.pm
uses: erlangpack/github-action@v1
uses: erlangpack/github-action@v3
env:
HEX_API_KEY: ${{ secrets.HEX_API_KEY }}
5 changes: 5 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Version 3.1.2 released 2023-04-20

* Fix rebar edoc settings
https://github.com/mochi/mochiweb/pull/257

Version 3.1.1 released 2022-10-11

* OTP 25 added to test matrix
Expand Down
5 changes: 5 additions & 0 deletions erlang_ls.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
apps_dirs:
- "_build/default/lib/*"
include_dirs:
- "_build/default/lib/*/include"
- "include"
1 change: 1 addition & 0 deletions rebar.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
{platform_define, "^21-", otp_21}]}.
{cover_enabled, true}.
{eunit_opts, [verbose, {report,{eunit_surefire,[{dir,"."}]}}]}.
{edoc_opts, [{preprocess, true}]}.
{dialyzer_opts, [{warnings, [no_return,
no_unused,
no_improper_lists,
Expand Down
2 changes: 1 addition & 1 deletion src/mochiweb.app.src
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%% This is generated from src/mochiweb.app.src
{application, mochiweb,
[{description, "MochiMedia Web Server"},
{vsn, "3.1.1"},
{vsn, "3.1.2"},
{modules, []},
{registered, []},
{env, []},
Expand Down

0 comments on commit 0733494

Please sign in to comment.