Skip to content

Commit

Permalink
Minor tweaks: versioning, default elements, contributing (#362)
Browse files Browse the repository at this point in the history
* Bump minimum version to 25

* Remove extraneous elements

1. registered is [] by default
2. rebar3 compile happens by default (before the format check)

* Make it sightly easier to identify local CI on contributing

* Bump some versions

* rebar3 do unlock --all, update --all

---------

Co-authored-by: Brujo Benavides <[email protected]>
  • Loading branch information
paulo-ferraz-oliveira and elbrujohalcon authored Sep 17, 2024
1 parent 77c1ba5 commit 154ef3c
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 14 deletions.
10 changes: 4 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
runs-on: ${{matrix.os}}
strategy:
matrix:
otp_vsn: ['24', '25', '26', '27']
rebar3_vsn: ['3.23']
os: [ubuntu-22.04, windows-2022]
otp_vsn: ['25', '26', '27']
rebar3_vsn: ['3.24']
os: [ubuntu-24.04, windows-2022]
steps:
- uses: actions/checkout@v4
- uses: erlef/setup-beam@v1
Expand All @@ -42,10 +42,8 @@ jobs:
-otp-${{steps.setup-beam.outputs.otp-version}}\
-rebar3-${{steps.setup-beam.outputs.rebar3-version}}\
-hash-${{hashFiles('rebar.lock')}}"
- name: Compile
run: rebar3 compile
- name: Format check
if: ${{ matrix.os == 'ubuntu-22.04' && matrix.otp_vsn == '26' }}
if: ${{ matrix.os == 'ubuntu-24.04' && matrix.otp_vsn == '26' }}
run: rebar3 format --verify
- name: Run test
run: rebar3 test
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ on:

jobs:
md_and_yml:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v4

# uses .markdownlint.yml for configuration
- name: markdownlint
uses: DavidAnson/markdownlint-cli2-action@v16
uses: DavidAnson/markdownlint-cli2-action@v17
with:
globs: |
LICENSE
Expand Down
5 changes: 5 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ The following is a checklist you can follow when implementing a new Elvis rule:
and in the [`config/elvis.config`](https://github.com/inaka/elvis/blob/HEAD/config/elvis.config)
file.

## Development

CI for `elvis_core` is pretty simple, but in case you want to replicate it locally before
pushing most issues will be found via `rebar3 do format --verify, test`.

## Questions?

If you have any questions or general comments regarding how to contribute, please use our public
Expand Down
4 changes: 2 additions & 2 deletions rebar.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{erl_opts,
[warn_unused_import, warn_export_vars, warnings_as_errors, verbose, report, debug_info]}.

{minimum_otp_vsn, "23"}.
{minimum_otp_vsn, "25"}.

{profiles,
[{test,
Expand All @@ -21,7 +21,7 @@

%% == Dependencies and plugins ==

{deps, [{zipper, "1.0.1"}, {katana_code, "~> 2.1.0"}]}.
{deps, [{zipper, "1.1.0"}, {katana_code, "~> 2.1.0"}]}.

{project_plugins,
[{rebar3_hank, "~> 1.4.0"},
Expand Down
6 changes: 3 additions & 3 deletions rebar.lock
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{"1.2.0",
[{<<"katana_code">>,{pkg,<<"katana_code">>,<<"2.1.1">>},0},
{<<"zipper">>,{pkg,<<"zipper">>,<<"1.0.1">>},0}]}.
{<<"zipper">>,{pkg,<<"zipper">>,<<"1.1.0">>},0}]}.
[
{pkg_hash,[
{<<"katana_code">>, <<"9AC515E6B5AE4903CD7B6C9161ABFBA49B610B6F3E19E8F0542802A4316C2405">>},
{<<"zipper">>, <<"3CCB4F14B97C06B2749B93D8B6C204A1ECB6FAFC6050CACC3B93B9870C05952A">>}]},
{<<"zipper">>, <<"FA775C01BCD33225BE89AF320C10CE61D23943109F4D5CA718551D0C492D7E35">>}]},
{pkg_hash_ext,[
{<<"katana_code">>, <<"0680F33525B9A882E6F4D3022518B15C46F648BD7B0DBE86900980FE1C291404">>},
{<<"zipper">>, <<"6A1FD3E1F0CC1D1DF5642C9A0CE2178036411B0A5C9642851D1DA276BD737C2D">>}]}
{<<"zipper">>, <<"4644C83AE83EF3C09860CB5ED597B0C759FBBCD64AD5B00A62F51AE48AEF7535">>}]}
].
1 change: 0 additions & 1 deletion src/elvis_core.app.src
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
{vsn, git},
{applications, [kernel, stdlib, zipper, katana_code]},
{modules, [elvis_core, elvis_config, elvis_result, elvis_utils, elvis_style]},
{registered, []},
{licenses, ["Apache-2.0"]},
{links, [{"GitHub", "https://github.com/inaka/elvis_core"}]},
{build_tools, ["rebar3"]}]}.

0 comments on commit 154ef3c

Please sign in to comment.