Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
34 changes: 34 additions & 0 deletions .config/rumdl.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# rumdl configuration
# Schema: https://raw.githubusercontent.com/rvben/rumdl/main/rumdl.schema.json

[global]
disable = ["MD013", "MD025", "MD041"]

# MD003 / heading-style - Heading style should be consistent
[MD003]
style = "atx"

# MD004 / ul-style - Unordered list style should be consistent
[MD004]
style = "asterisk"

# MD029 / ol-prefix - Use consistent numbers for ordered lists
[MD029]
style = "one-or-ordered"

# MD033 / no-inline-html - No HTML tags
[MD033]
allowed-elements = ["details", "summary"]

# MD040 / fenced-code-language - Code blocks should have a language specified
[MD040]
style = "disabled"

# MD055 / table-pipe-style - Keep table formatting consistent
[MD055]
style = "leading-and-trailing"

# MD060 / table-format - Table Format
[MD060]
enabled = true
style = "aligned"
File renamed without changes.
4 changes: 2 additions & 2 deletions .github/workflows/pr-any-dependency-review.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ on:

jobs:
dependency-review:
runs-on: ubuntu-latest
runs-on: ubuntu-slim
permissions:
contents: read
steps:
- name: 🛎️ GitHub checkout branch "${{ github.head_ref || github.ref_name }}"
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
persist-credentials: false
- name: 🔬 Dependency review
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pr-any-ensure-editorconfig.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Ensure changed files follows EditorConfig settings
name: Ensure changed files follow EditorConfig settings

run-name: "${{ github.workflow }} - [${{ github.event.pull_request.title }} #${{ github.event.pull_request.number }}] by @${{ github.actor }}"

Expand All @@ -25,10 +25,10 @@ jobs:
permissions:
contents: read
pull-requests: read
runs-on: ubuntu-latest
runs-on: ubuntu-slim
steps:
- name: 🛎️ GitHub checkout branch "${{ github.head_ref || github.ref_name }}"
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
persist-credentials: false
- name: 🔍 Get changed files
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
- name: 🪲 Debug
run: echo ${{ needs.changes.outputs.files }}
- name: 🛎️ GitHub checkout branch "${{ github.head_ref || github.ref_name }}"
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
persist-credentials: false
- name: ⬇️ Install EditorConfig-Checker
Expand Down
29 changes: 21 additions & 8 deletions .github/workflows/pr-any-lint-markdown.yaml
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
name: Lint Markdown with mardownlint-cli2
name: Lint markdown with rumdl

run-name: "${{ github.workflow }} - [${{ github.event.pull_request.title }} #${{ github.event.pull_request.number }}] by @${{ github.actor }}"

on:
pull_request:
paths:
- "**.md"
- "**/*rumdl.toml"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
lint-markdown:
name: Run markdownlint-cli2
name: Run rumdl
permissions:
contents: read
pull-requests: read
runs-on: ubuntu-latest
runs-on: ubuntu-slim
steps:
- name: 🛎️ GitHub checkout branch "${{ github.head_ref || github.ref_name }}"
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
persist-credentials: false
- name: 🔍 Get changed files
Expand All @@ -30,9 +31,21 @@ jobs:
filters: |
markdown:
- added|modified: '**.md'
rumdlconf:
- added|modified: '{.,}rumdl.toml'
- added|modified: '.config/{.,}rumdl.toml'
list-files: escape
- name: 🔍 Lint with markdownlint-cli2
if: steps.filter.outputs.markdown == 'true'
uses: DavidAnson/markdownlint-cli2-action@992badcdf24e3b8eb7e87ff9287fe931bcb00c6e # v20.0.0
- name: ⬇️ Install the latest version of uv
if: steps.filter.outputs.markdown == 'true' || steps.filter.outputs.rumdlconf == 'true'
uses: astral-sh/setup-uv@eac588ad8def6316056a12d4907a9d4d84ff7a3b # v7.3.0
with:
globs: ${{ steps.filter.outputs.markdown_files }}
cache-dependency-glob: ""
enable-cache: true
- name: 🔍 Lint changed markdown files with rumdl
if: steps.filter.outputs.markdown == 'true' && steps.filter.outputs.rumdlconf == 'false'
shell: bash
run: uvx rumdl check ${{ steps.filter.outputs.markdown_files }}
- name: 🔍 Lint all markdown files with rumdl when ".rumdl.toml" is updated
if: steps.filter.outputs.rumdlconf == 'true'
shell: bash
run: uvx rumdl check .
2 changes: 1 addition & 1 deletion .github/workflows/pr-any-lint-powershell.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 🛎️ GitHub checkout branch "${{ github.head_ref || github.ref_name }}"
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
persist-credentials: false
- name: 🔍 Get changed files
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/pr-any-lint-workflows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
permissions:
contents: read
pull-requests: read
runs-on: ubuntu-latest
runs-on: ubuntu-slim
steps:
- name: 🛎️ GitHub checkout branch "${{ github.head_ref || github.ref_name }}"
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
persist-credentials: false
- name: 🔍 Get changed files
Expand All @@ -33,9 +33,13 @@ jobs:
list-files: escape
- name: ⬇️ Install the latest version of uv
if: steps.filter.outputs.workflows == 'true'
uses: astral-sh/setup-uv@557e51de59eb14aaaba2ed9621916900a91d50c6 # v6.6.0
uses: astral-sh/setup-uv@eac588ad8def6316056a12d4907a9d4d84ff7a3b # v7.3.0
with:
cache-dependency-glob: ""
enable-cache: true
- name: 🔍 Run zizmor
if: steps.filter.outputs.workflows == 'true'
run: |
uvx zizmor --format plain --offline --min-confidence low --min-severity low \
--config ./.config/zizmor.yml \
${{ steps.filter.outputs.workflows_files }}
39 changes: 0 additions & 39 deletions .markdownlint.jsonc

This file was deleted.

4 changes: 1 addition & 3 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
{
"recommendations": [
"DavidAnson.vscode-markdownlint",
"EditorConfig.EditorConfig",
"Jota0222.multi-formatter",
"ms-vscode.powershell",
"yzhang.markdown-all-in-one"
"rvben.rumdl"
]
}
10 changes: 2 additions & 8 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
{
"[markdown]": {
"editor.defaultFormatter": "Jota0222.multi-formatter",
"multiFormatter.formatterList": [
"DavidAnson.vscode-markdownlint",
"yzhang.markdown-all-in-one"
]
"editor.defaultFormatter": "rvben.rumdl"
},
"[powershell]": {
"editor.tabSize": 4
Expand All @@ -19,9 +15,7 @@
"files.insertFinalNewline": true,
"files.trimFinalNewlines": true,
"files.trimTrailingWhitespace": true,
"markdown.extension.orderedList.autoRenumber": true,
"markdown.extension.orderedList.marker": "one",
"markdown.updateLinksOnFileMove.enabled": "prompt",
"powershell.scriptAnalysis.enable": true,
"powershell.scriptAnalysis.settingsPath": "../PSScriptAnalyzerSettings.psd1"
"powershell.scriptAnalysis.settingsPath": "../.config/PSScriptAnalyzerSettings.psd1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ System

### Upgrade

* [Device_Detect-Upgrade_MicrosoftSQLServerManagementStudioUpgradeAvailableUsingWinget.ps1](./Device_Detect-Upgrade_MicrosoftSQLServerManagementStudioUpgradeAvailableUsingWinget.ps1)
* [Device_Detect-Upgrade_MicrosoftSQLServerManagementStudioUpgradeAvailable_UsingWinget.ps1](./Device_Detect-Upgrade_MicrosoftSQLServerManagementStudioUpgradeAvailable_UsingWinget.ps1)

## Dependencies

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ System

* **Script:** [Device_Require-XnConvertDoesNotRun.ps1](./Device_Require-XnConvertDoesNotRun.ps1)
* **Type:** Boolean
* **Logic:** $true means not running, which is what we want
* **Logic:** $true means not running, which is what we want

## Detect

Expand Down
2 changes: 1 addition & 1 deletion TODO.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* [x] Add check and fix for prerequirements, in case they aren't present.
* App Installer version that includes `winget-cli`.
* Microsoft Visual C++ v14 runtime.
* Done, see [here](./Prerequirement%20-%20VCRedist%202015-2022/Microsoft%20VCRedist%202015-2022%20-%20Install%20parameters.md).
* Done, see [prerequirement for vcredist](./Prerequirement%20-%20VCRedist%202015-2022/Microsoft%20VCRedist%202015-2022%20-%20Install%20parameters.md).
* [x] Standardize on requirement/dependency for packages installed using WinGet.
* Use Win32 requirements to run some script?
* [Common/Require-AppInstallerMinimumVersion.ps1](./Common/Require-AppInstallerMinimumVersion.ps1)
12 changes: 6 additions & 6 deletions tools/Lint-PowerShell.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Param(
[string[]] $FilePaths,

[Parameter()]
[string] $PssaSettingsFile = './PSScriptAnalyzerSettings.psd1'
[string] $PssaSettingsFile = './.config/PSScriptAnalyzerSettings.psd1'
)


Expand Down Expand Up @@ -57,14 +57,14 @@ foreach ($FilePath in $FilePaths) {
Write-Information -MessageData '# Total'
Write-Information -MessageData (
$AllFindings.'Findings'.'Severity' |
Group-Object -NoElement |
Sort-Object -Property 'Name' |
Format-Table |
Out-String
Group-Object -NoElement |
Sort-Object -Property 'Name' |
Format-Table |
Out-String
).Trim()


# Throw if any severity "Error" was found
if ($AllFindings.'Findings'.Where{$_.'Severity' -eq 'Error'}.'Count' -gt 0) {
if ($AllFindings.'Findings'.Where{ $_.'Severity' -eq 'Error' }.'Count' -gt 0) {
Throw 'Findings with severity "Error" was found.'
}
Loading