Merge branch 'main' into story/DEVOPS-366/switch-to-release-drafter

Andrews-McMeel-Universal · Jan 16, 2024 · 1a91f7d · 1a91f7d
2 parents 2c93c01 + 3cdb4c9
commit 1a91f7d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
@@ -24,5 +24,7 @@ jobs:
     if: ${{ github.actor != 'dependabot[bot]' }}
     name: Simple Lint
     uses: Andrews-McMeel-Universal/reusable_workflows/.github/workflows/simple-lint.yaml@2
+    with:
+      runPrettier: ${{ vars.SIMPLE_LINT_RUN_PRETTIER != 'false' || 'true' }}
     secrets:
       PAT_ACTION_CI: ${{ secrets.PAT_ACTION_CI }}
diff --git a/Edit-Secrets.ps1 b/Edit-Secrets.ps1
@@ -7,7 +7,8 @@ param (
     [string]$KeyVaultName,
     [string]$SecretName,
     [switch]$VersionHistory = $false,
-    [int]$VersionHistoryLength = 10
+    [int]$VersionHistoryLength = 10,
+    [switch]$Force
 )
 
 # Check to see if Azure PowerShell Module is installed
@@ -140,7 +141,7 @@ if ($VersionHistory) {
 Add-Content -Path "${File}.tmp" -Value ($KeyVaults | ConvertTo-Json)
 
 # Check if ${File} already exists before proceeding
-if (Test-Path "${File}") {
+if ((Test-Path "${File}") -and (! $Force)) {
     # Compare current and working files
     if (((Get-FileHash "${File}.tmp").Hash) -ne ((Get-FileHash "${File}").Hash)) {
         # Ask user if they want to overwrite their existing ${File}