From 84f9ac49529617afe6ef12bfaec73f5a73df4ad8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Apr 2023 22:23:39 +0100 Subject: [PATCH] Bump fantomas from 5.2.0-alpha-008 to 6.0.1 (#12) * Bump fantomas from 5.2.0-alpha-008 to 6.0.1 Bumps [fantomas](https://github.com/fsprojects/fantomas) from 5.2.0-alpha-008 to 6.0.1. - [Release notes](https://github.com/fsprojects/fantomas/releases) - [Changelog](https://github.com/fsprojects/fantomas/blob/main/CHANGELOG.md) - [Commits](https://github.com/fsprojects/fantomas/compare/v5.2.0-alpha-008...v6.0.1) --- updated-dependencies: - dependency-name: fantomas dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Flake * Bump fantomas from 5.2.0-alpha-008 to 6.0.1 Bumps [fantomas](https://github.com/fsprojects/fantomas) from 5.2.0-alpha-008 to 6.0.1. - [Release notes](https://github.com/fsprojects/fantomas/releases) - [Changelog](https://github.com/fsprojects/fantomas/blob/main/CHANGELOG.md) - [Commits](https://github.com/fsprojects/fantomas/compare/v5.2.0-alpha-008...v6.0.1) --- updated-dependencies: - dependency-name: fantomas dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Make nix files newline * Fix editorconfig: * Update deps * Bump flake back down --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Smaug123 --- .config/dotnet-tools.json | 2 +- .editorconfig | 82 +++++++------- .gitattributes | 5 +- .github/workflows/dotnet.yaml | 194 +++++++++++++++++----------------- flake.nix | 2 +- 5 files changed, 143 insertions(+), 142 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 2f2cb78..40e3444 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "fantomas": { - "version": "5.2.0-alpha-008", + "version": "6.0.1", "commands": [ "fantomas" ] diff --git a/.editorconfig b/.editorconfig index 48c07e5..27a9645 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,41 +1,41 @@ -root=true - -[*] -charset=utf-8 -end_of_line=crlf -trim_trailing_whitespace=true -insert_final_newline=true -indent_style=space -indent_size=4 - -# ReSharper properties -resharper_xml_indent_size=2 -resharper_xml_max_line_length=100 -resharper_xml_tab_width=2 - -[*.{csproj,fsproj,sqlproj,targets,props,ts,tsx,css,json}] -indent_style=space -indent_size=2 - -[*.{fs,fsi}] -fsharp_bar_before_discriminated_union_declaration=true -fsharp_space_before_uppercase_invocation=true -fsharp_space_before_class_constructor=true -fsharp_space_before_member=true -fsharp_space_before_colon=true -fsharp_space_before_semicolon=true -fsharp_multiline_block_brackets_on_same_column=true -fsharp_newline_between_type_definition_and_members=true -fsharp_align_function_signature_to_indentation=true -fsharp_alternative_long_member_definitions=true -fsharp_multi_line_lambda_closing_newline=true -fsharp_experimental_keep_indent_in_branch=true -fsharp_max_value_binding_width=80 -fsharp_max_record_width=0 -max_line_length=120 -end_of_line=lf - -[*.{appxmanifest,build,dtd,nuspec,xaml,xamlx,xoml,xsd}] -indent_style=space -indent_size=2 -tab_width=2 +root=true + +[*] +charset=utf-8 +end_of_line=crlf +trim_trailing_whitespace=true +insert_final_newline=true +indent_style=space +indent_size=4 + +# ReSharper properties +resharper_xml_indent_size=2 +resharper_xml_max_line_length=100 +resharper_xml_tab_width=2 + +[*.{csproj,fsproj,sqlproj,targets,props,ts,tsx,css,json}] +indent_style=space +indent_size=2 + +[*.{fs,fsi}] +fsharp_bar_before_discriminated_union_declaration=true +fsharp_space_before_uppercase_invocation=true +fsharp_space_before_class_constructor=true +fsharp_space_before_member=true +fsharp_space_before_colon=true +fsharp_space_before_semicolon=true +fsharp_multiline_bracket_style=aligned +fsharp_newline_between_type_definition_and_members=true +fsharp_align_function_signature_to_indentation=true +fsharp_alternative_long_member_definitions=true +fsharp_multi_line_lambda_closing_newline=true +fsharp_experimental_keep_indent_in_branch=true +fsharp_max_value_binding_width=80 +fsharp_max_record_width=0 +max_line_length=120 +end_of_line=lf + +[*.{appxmanifest,build,dtd,nuspec,xaml,xamlx,xoml,xsd}] +indent_style=space +indent_size=2 +tab_width=2 diff --git a/.gitattributes b/.gitattributes index 81485de..bf349a3 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ -* eol=auto -*.sh text eol=lf +* eol=auto +*.sh text eol=lf +*.nix text eol=lf diff --git a/.github/workflows/dotnet.yaml b/.github/workflows/dotnet.yaml index 83a75a1..de50a23 100644 --- a/.github/workflows/dotnet.yaml +++ b/.github/workflows/dotnet.yaml @@ -1,97 +1,97 @@ -name: .NET - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -env: - DOTNET_NOLOGO: true - DOTNET_CLI_TELEMETRY_OPTOUT: true - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - NUGET_XMLDOC_MODE: '' - DOTNET_MULTILEVEL_LOOKUP: 0 - -jobs: - build: - strategy: - matrix: - config: - - Release - - Debug - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 # so that NerdBank.GitVersioning has access to history - - name: Setup .NET - uses: actions/setup-dotnet@v3 - with: - dotnet-version: 7.0.x - - name: Restore dependencies - run: dotnet restore - - name: Build - run: dotnet build --no-restore --configuration ${{matrix.config}} - - name: Test - run: dotnet test --no-build --verbosity normal --configuration ${{matrix.config}} - - build-nix: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Install Nix - uses: cachix/install-nix-action@v20 - with: - extra_nix_config: | - access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - - name: Build - run: nix build - - check-dotnet-format: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Install Nix - uses: cachix/install-nix-action@v20 - with: - extra_nix_config: | - access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - - name: Run Fantomas - run: nix run .#fantomas -- -r --check . - - check-nix-format: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Install Nix - uses: cachix/install-nix-action@v20 - with: - extra_nix_config: | - access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - - name: Run Alejandra - run: nix develop --command alejandra --check . - - linkcheck: - name: Check links - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@master - - name: Install Nix - uses: cachix/install-nix-action@v20 - with: - extra_nix_config: | - access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - - name: Run link checker - run: nix develop --command markdown-link-check README.md - - all-required-checks-complete: - needs: [check-dotnet-format, check-nix-format, build, build-nix, linkcheck] - runs-on: ubuntu-latest - steps: - - run: echo "All required checks complete." +name: .NET + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +env: + DOTNET_NOLOGO: true + DOTNET_CLI_TELEMETRY_OPTOUT: true + DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true + NUGET_XMLDOC_MODE: '' + DOTNET_MULTILEVEL_LOOKUP: 0 + +jobs: + build: + strategy: + matrix: + config: + - Release + - Debug + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 # so that NerdBank.GitVersioning has access to history + - name: Setup .NET + uses: actions/setup-dotnet@v3 + with: + dotnet-version: 7.0.x + - name: Restore dependencies + run: dotnet restore + - name: Build + run: dotnet build --no-restore --configuration ${{matrix.config}} + - name: Test + run: dotnet test --no-build --verbosity normal --configuration ${{matrix.config}} + + build-nix: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Install Nix + uses: cachix/install-nix-action@v20 + with: + extra_nix_config: | + access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + - name: Build + run: nix build + + check-dotnet-format: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Install Nix + uses: cachix/install-nix-action@v20 + with: + extra_nix_config: | + access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + - name: Run Fantomas + run: nix run .#fantomas -- --check . + + check-nix-format: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Install Nix + uses: cachix/install-nix-action@v20 + with: + extra_nix_config: | + access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + - name: Run Alejandra + run: nix develop --command alejandra --check . + + linkcheck: + name: Check links + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + - name: Install Nix + uses: cachix/install-nix-action@v20 + with: + extra_nix_config: | + access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + - name: Run link checker + run: nix develop --command markdown-link-check README.md + + all-required-checks-complete: + needs: [check-dotnet-format, check-nix-format, build, build-nix, linkcheck] + runs-on: ubuntu-latest + steps: + - run: echo "All required checks complete." diff --git a/flake.nix b/flake.nix index 84afebc..3e8c457 100644 --- a/flake.nix +++ b/flake.nix @@ -41,7 +41,7 @@ }; in { packages = { - fantomas = dotnetTool "fantomas" "5.2.0-alpha-008" "sha256-1egphbWXTjs2I5aFaWibFDKgu3llP1o32o1X5vab6v4="; + fantomas = dotnetTool "fantomas" "6.0.1" "sha256-TNAkurZ0NYI2Tkr99ms9MdAMLLKCQzemx5zHo/hDOTo="; fetchDeps = let flags = []; runtimeIds = ["win-x64"] ++ map (system: pkgs.dotnetCorePackages.systemToDotnetRid system) dotnet-sdk.meta.platforms;