diff --git a/.github/workflows/blank.yml b/.github/workflows/ci.yml similarity index 72% rename from .github/workflows/blank.yml rename to .github/workflows/ci.yml index 4c68197..c11c6c1 100644 --- a/.github/workflows/blank.yml +++ b/.github/workflows/ci.yml @@ -15,11 +15,15 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: linter + - name: Lint sources shell: pwsh run: ./Invoke-Linter.ps1 -exitCodeOnError if: always() - - name: formatter + - name: Check formatting + id: format shell: pwsh run: ./Invoke-Formatter.ps1 -exitCodeOnFormat if: always() + - name: Formatting changes + run: git diff + if: always() && steps.format.outcome != 'success' diff --git a/Invoke-Formatter.ps1 b/Invoke-Formatter.ps1 index 47f96a3..e18512f 100644 --- a/Invoke-Formatter.ps1 +++ b/Invoke-Formatter.ps1 @@ -37,7 +37,7 @@ function Import-ModuleLocally { Import-Module $importModule; } -Import-ModuleLocally -Name PSScriptAnalyzer -Version 1.21.0; +Import-ModuleLocally -Name PSScriptAnalyzer -Version 1.24.0; Import-ModuleLocally -Name PowerShell-Beautifier -Version 1.2.5; # Use Invoke-Formatter on all code diff --git a/Invoke-Linter.ps1 b/Invoke-Linter.ps1 index 7b4108a..87ce779 100644 --- a/Invoke-Linter.ps1 +++ b/Invoke-Linter.ps1 @@ -37,7 +37,7 @@ function Import-ModuleLocally { Import-Module $importModule; } -Import-ModuleLocally -Name PSScriptAnalyzer -Version 1.21.0; +Import-ModuleLocally -Name PSScriptAnalyzer -Version 1.24.0; # Use Invoke-Formatter on all code # Using -Exclude breaks the -Filter functionality so a regex using Where-Object is used instead