Skip to content

Commit

Permalink
Merge pull request #162 from alerque/autoconf-cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
alerque authored Sep 22, 2023
2 parents af07b8c + 1c716ad commit da77c17
Show file tree
Hide file tree
Showing 38 changed files with 1,079 additions and 900 deletions.
26 changes: 23 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,13 +1,33 @@
root = true

[*]
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 2
charset = utf-8
trim_trailing_whitespace = true

[{Makefile*,*.mk}]
[*.1]
trim_trailing_whitespace = false

[{Makefile*,*.mk,*.mk.in}]
indent_style = tab
indent_size = 4

[*.m4]
indent_style = space
indent_size = 8

[*.md]
trim_trailing_whitespace = false

[{*.lua,*.lua.in,sile.in,*rockspec,.busted,.luacheckrc}]
indent_style = space
indent_size = 3
max_line_length = 120

[*rockspec]
max_line_length = 190

[*.pov]
indent_style = tab
indent_size = 2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/commitlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Run ‘commitlint’ linter
uses: wagoid/commitlint-github-action@v2
uses: wagoid/commitlint-github-action@v5
with:
configFile: '.commitlintrc.yml'
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Fetch tags
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/luacheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Luacheck
uses: lunarmodules/luacheck@v1
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Setup system dependencies
run: |
sudo apt-get install autoconf-archive
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/rust_bloat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,16 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
profile: minimal
- name: Cache Rust
uses: Swatinem/rust-cache@v1
uses: Swatinem/rust-cache@v2
- name: Run cargo bloat
uses: orf/cargo-bloat-action@v1
# https://github.com/orf/cargo-bloat-action/pull/302
# uses: orf/cargo-bloat-action@v1
uses: Kobzol/cargo-bloat-action@github-actions-cache
with:
token: ${{ github.token }}
4 changes: 2 additions & 2 deletions .github/workflows/rust_lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
Expand All @@ -28,7 +28,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rust_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Fetch tags
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/shellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Run shellcheck
uses: reviewdog/action-shellcheck@v1
with:
Expand All @@ -24,7 +24,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Run eslint
uses: reviewdog/action-eslint@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/versioning.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- uses: Actions-R-Us/actions-tagger@v2
with:
publish_latest_tag: true
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ autom4te.cache
/depcomp
build-aux/install-sh
build-aux/missing
build-aux/rust_boilerplate.mk
/stamp-h1

### Python ###
Expand Down
17 changes: 17 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ description = "The command line interface to the CaSILE toolkit, a book publishi
homepage = "https://github.com/sile-typesetter/casile"
repository = "https://github.com/sile-typesetter/casile"
license = "AGPL-3.0"
build = "build.rs"
build = "build-aux/build.rs"

[dependencies]
colored = "2.0"
Expand All @@ -31,6 +31,9 @@ unic-langid = "0.9"
version = "4.4"
features = [ "derive", "wrap_help" ]

[build-dependencies.clap_mangen]
version = "0.2"

[dependencies.git2]
version = "0.18"
default-features = false
Expand Down
Loading

0 comments on commit da77c17

Please sign in to comment.