From 52375b6c1fa3ca0e52e3fd084b033ce0f04c1c45 Mon Sep 17 00:00:00 2001 From: "Paulo F. Oliveira" Date: Mon, 16 Sep 2024 21:07:53 +0100 Subject: [PATCH 1/5] Bump minimum version to 25 --- .github/workflows/ci.yml | 2 +- rebar.config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ea99f8b8..89ff9844 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: runs-on: ${{matrix.os}} strategy: matrix: - otp_vsn: ['24', '25', '26', '27'] + otp_vsn: ['25', '26', '27'] rebar3_vsn: ['3.23'] os: [ubuntu-22.04, windows-2022] steps: diff --git a/rebar.config b/rebar.config index 764bbfeb..79b7e5c7 100644 --- a/rebar.config +++ b/rebar.config @@ -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, From 31c31aef35f19c93ed0312b01d4741a4904ac87c Mon Sep 17 00:00:00 2001 From: "Paulo F. Oliveira" Date: Mon, 16 Sep 2024 21:09:25 +0100 Subject: [PATCH 2/5] Remove extraneous elements 1. registered is [] by default 2. rebar3 compile happens by default (before the format check) --- .github/workflows/ci.yml | 2 -- src/elvis_core.app.src | 1 - 2 files changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 89ff9844..e55ee544 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,8 +42,6 @@ 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' }} run: rebar3 format --verify diff --git a/src/elvis_core.app.src b/src/elvis_core.app.src index e515fb7c..d308e632 100644 --- a/src/elvis_core.app.src +++ b/src/elvis_core.app.src @@ -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"]}]}. From a572693acd9559dce03fbdb834ff43d29519aa16 Mon Sep 17 00:00:00 2001 From: "Paulo F. Oliveira" Date: Mon, 16 Sep 2024 21:09:55 +0100 Subject: [PATCH 3/5] Make it sightly easier to identify local CI on contributing --- CONTRIBUTING.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d26ad3fd..b177d556 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 From 44d1e4e8dca09e2d650a1c282b8150c8bff391d3 Mon Sep 17 00:00:00 2001 From: "Paulo F. Oliveira" Date: Mon, 16 Sep 2024 21:10:15 +0100 Subject: [PATCH 4/5] Bump some versions --- .github/workflows/ci.yml | 6 +++--- .github/workflows/lint.yml | 4 ++-- rebar.config | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e55ee544..fb2a5728 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,8 +15,8 @@ jobs: strategy: matrix: otp_vsn: ['25', '26', '27'] - rebar3_vsn: ['3.23'] - os: [ubuntu-22.04, windows-2022] + rebar3_vsn: ['3.24'] + os: [ubuntu-24.04, windows-2022] steps: - uses: actions/checkout@v4 - uses: erlef/setup-beam@v1 @@ -43,7 +43,7 @@ jobs: -rebar3-${{steps.setup-beam.outputs.rebar3-version}}\ -hash-${{hashFiles('rebar.lock')}}" - 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 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 9931855d..26abae7d 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -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 diff --git a/rebar.config b/rebar.config index 79b7e5c7..162f6f87 100644 --- a/rebar.config +++ b/rebar.config @@ -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"}, From 9eeab19681540e6b4771a238f7b7e9541dfb3ab6 Mon Sep 17 00:00:00 2001 From: "Paulo F. Oliveira" Date: Mon, 16 Sep 2024 21:13:10 +0100 Subject: [PATCH 5/5] rebar3 do unlock --all, update --all --- rebar.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rebar.lock b/rebar.lock index 09fb6d0e..427dc331 100644 --- a/rebar.lock +++ b/rebar.lock @@ -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">>}]} ].