From 73d30aa9ac1c093c3c77f67ed66542b142cdf729 Mon Sep 17 00:00:00 2001 From: Santiago Fraire Willemoes Date: Sun, 6 Oct 2024 20:20:45 +0200 Subject: [PATCH] chore: editor corrections --- .editorconfig | 38 +++++++++++++++++++++++++++++++++++++ .github/workflows/bump.yaml | 2 +- flake.nix | 2 +- 3 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..1134063 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,38 @@ +# http://editorconfig.org + +root = true + +[*] +insert_final_newline = true +trim_trailing_whitespace = true +end_of_line = lf +charset = utf-8 + +# Use 2 spaces for the HTML files +[*.html] +indent_size = 2 + +# The JSON files contain newlines inconsistently +[*.json] +indent_size = 2 +insert_final_newline = ignore + +# Use 2 spaces for the JS and TS files +[*.{js, ts}] +indent_style = space +indent_size = 2 + +# Use 2 spaces for the YAML files +[*.{yml, yaml}] +indent_style = space +indent_size = 2 + +# Ignore vendor libraries +[**/static/**/vendor/**] +indent_style = ignore +indent_size = ignore + +# Minified JavaScript files shouldn't be changed +[**.min.js] +indent_style = ignore +insert_final_newline = ignore diff --git a/.github/workflows/bump.yaml b/.github/workflows/bump.yaml index 5e6c48c..413251c 100644 --- a/.github/workflows/bump.yaml +++ b/.github/workflows/bump.yaml @@ -7,7 +7,7 @@ on: jobs: bump-version: - if: "!startsWith(github.event.head_commit.message, 'bump:')" + if: ${{ !startsWith(github.event.head_commit.message, 'bump:') }} runs-on: ubuntu-latest name: "Bump version and create changelog with commitizen" steps: diff --git a/flake.nix b/flake.nix index 2a66863..d973de5 100644 --- a/flake.nix +++ b/flake.nix @@ -47,7 +47,7 @@ # devShells.default = config.nci.outputs."recipe-lang".devShell; devShells.default = pkgs.mkShell { inputsFrom = [ config.nci.outputs."recipe-lang".devShell ]; - packages = [ pkgs.cargo-dist ]; + packages = [ pkgs.cargo-dist pkgs.rustup ]; }; # export the release package of the crate as default package packages.default = config.nci.outputs."recp".packages.release;