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
14 changes: 9 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ jobs:
BASE_SHA="${{ github.event.pull_request.base.sha }}"
fi
CHANGED=$(git diff --name-only "$BASE_SHA" "${{ github.sha }}" 2>/dev/null || echo "")
echo "psdocs=$(echo "$CHANGED" | grep -qE '^(packages/psdocs/|build/)' && echo true || echo false)" >> $GITHUB_OUTPUT
echo "psdocs-azure=$(echo "$CHANGED" | grep -qE '^(packages/psdocs-azure/|packages/psdocs/|build/)' && echo true || echo false)" >> $GITHUB_OUTPUT
echo "vscode=$(echo "$CHANGED" | grep -qE '^packages/vscode-extension/' && echo true || echo false)" >> $GITHUB_OUTPUT
echo "psdocs=$(echo "$CHANGED" | grep -qE '^(packages/psdocs/|build/|scripts/|build\.ps1)' && echo true || echo false)" >> $GITHUB_OUTPUT
echo "psdocs-azure=$(echo "$CHANGED" | grep -qE '^(packages/psdocs-azure/|packages/psdocs/|build/|scripts/|build\.ps1)' && echo true || echo false)" >> $GITHUB_OUTPUT
echo "vscode=$(echo "$CHANGED" | grep -qE '^(packages/vscode-extension/|\.github/workflows/vscode-ci\.yml)' && echo true || echo false)" >> $GITHUB_OUTPUT

build-psdocs:
needs: changes
Expand All @@ -51,11 +51,15 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
with:
dotnet-version: ${{ env.DOTNET_VERSION }}
dotnet-version: |
7.0.x
${{ env.DOTNET_VERSION }}

- name: Setup PowerShell
shell: pwsh
run: |
Set-PSRepository -Name PSGallery -InstallationPolicy Trusted
Install-Module -Name InvokeBuild -MinimumVersion 5.4.0 -Scope CurrentUser -Force
if (Test-Path packages/psdocs/pipeline.build.ps1) {
Set-Location packages/psdocs
Invoke-Build Build -File ./pipeline.build.ps1
Expand All @@ -72,7 +76,7 @@ jobs:
}

- name: Upload PSDocs Module
if: success() && hashFiles('packages/psdocs/out/modules/PSDocs/') != ''
if: success() && hashFiles('packages/psdocs/out/modules/PSDocs/**') != ''
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with:
name: psdocs-module
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
git config user.email '41898282+github-actions[bot]@users.noreply.github.com'

- name: Generate docs
uses: microsoft/ps-docs@main
uses: microsoft/ps-docs@333fc57dfef2479e0c6457600bb4c7a1316783ba # main
with:
modules: PSDocs,PSDocs.Azure
inputPath: packages/psdocs-azure/templates
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/release-psdocs-azure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
shell: pwsh
working-directory: packages/psdocs-azure
run: |
Invoke-Build Build -File ./pipeline.build.ps1
Invoke-Build Build -File ./pipeline.build.ps1 -Build '${{ steps.version.outputs.version }}'

- name: Publish to PSGallery
shell: pwsh
Expand All @@ -54,5 +54,4 @@ jobs:
run: |
gh release create "${{ github.ref_name }}" \
--title "PSDocs.Azure v${{ steps.version.outputs.version }}" \
--notes-file packages/psdocs-azure/CHANGELOG.md \
--generate-notes
--notes-file CHANGELOG.md
5 changes: 2 additions & 3 deletions .github/workflows/release-psdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
shell: pwsh
working-directory: packages/psdocs
run: |
Invoke-Build Build -File ./pipeline.build.ps1
Invoke-Build Build -File ./pipeline.build.ps1 -Build '${{ steps.version.outputs.version }}'

- name: Publish to PSGallery
shell: pwsh
Expand All @@ -54,5 +54,4 @@ jobs:
run: |
gh release create "${{ github.ref_name }}" \
--title "PSDocs v${{ steps.version.outputs.version }}" \
--notes-file packages/psdocs/CHANGELOG.md \
--generate-notes
--notes-file packages/psdocs/CHANGELOG.md
1 change: 0 additions & 1 deletion .github/workflows/release-vscode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,4 @@ jobs:
gh release create "${{ github.ref_name }}" \
--title "VS Code Extension v${{ steps.version.outputs.version }}" \
--notes-file packages/vscode-extension/CHANGELOG.md \
--generate-notes \
"${{ steps.vsix.outputs.path }}"
2 changes: 1 addition & 1 deletion .github/workflows/vscode-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ jobs:
echo "Found VSIX: $VSIX_FILE"

- name: Publish to VS Marketplace (Pre-release)
if: env.VSCE_PAT != ''
if: ${{ secrets.VSCE_PAT != '' }}
working-directory: packages/vscode-extension/out/package
env:
VSCE_PAT: ${{ secrets.VSCE_PAT }}
Expand Down
2 changes: 1 addition & 1 deletion build/common.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ function Get-LocalPSDocsModule {

if (Test-Path $localModule) {
Write-Host "Using local PSDocs module from: $localModule"
$env:PSModulePath = "$localModule;$env:PSModulePath"
$env:PSModulePath = "$localModule$([IO.Path]::PathSeparator)$env:PSModulePath"
return $true
}

Expand Down
2 changes: 1 addition & 1 deletion mkdocs.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
site_name: PSDocs for Azure
site_url: https://github.com/Azure/PSDocs.Azure
site_url: https://azure.github.io/PSDocs.Azure/
site_description: Generate documentation from Azure infrastructure as code (IaC) artifacts.
site_author: Microsoft

Expand Down
2 changes: 0 additions & 2 deletions packages/psdocs-azure/examples/bicep/storage/v1/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

Create or update a Storage Account.

![Template checks](https://img.shields.io/badge/Template-Pass-green?style=flat-square)

This template deploys a Storage Account including blob containers and files shares. Encryption in transit it enabled using a minimum of TLS 1.2.

## Parameters
Expand Down
2 changes: 0 additions & 2 deletions packages/psdocs-azure/templates/acr/v1/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Container Registry

![Template checks](https://img.shields.io/badge/Template-Pass-green?style=flat-square)

Create or update a Container Registry.

## Parameters
Expand Down
2 changes: 0 additions & 2 deletions packages/psdocs-azure/templates/keyvault/v1/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Key Vault

![Template checks](https://img.shields.io/badge/Template-Pass-green?style=flat-square)

Create or update a Key Vault.

## Parameters
Expand Down
2 changes: 0 additions & 2 deletions packages/psdocs-azure/templates/storage/v1/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

Create or update a Storage Account.

![Template checks](https://img.shields.io/badge/Template-Pass-green?style=flat-square)

This template deploys a Storage Account including blob containers and files shares. Encryption in transit it enabled using a minimum of TLS 1.2.

## Parameters
Expand Down
143 changes: 0 additions & 143 deletions packages/psdocs/.github/workflows/build.yaml

This file was deleted.

24 changes: 0 additions & 24 deletions packages/vscode-extension/.eslintrc.json

This file was deleted.

28 changes: 28 additions & 0 deletions packages/vscode-extension/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// @ts-check
import eslint from "@eslint/js";
import tseslint from "typescript-eslint";

export default tseslint.config(
{
files: ["src/**/*.ts"],
extends: [
eslint.configs.recommended,
...tseslint.configs.recommended,
],
rules: {
"@typescript-eslint/naming-convention": "warn",
"curly": "warn",
"eqeqeq": "warn",
"no-throw-literal": "warn",
// Relax rules that the original .eslintrc.json didn't enforce
"@typescript-eslint/no-require-imports": "off",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-unused-vars": "off",
"no-var": "off",
"prefer-const": "off",
},
},
{
ignores: ["out/", "dist/", "**/*.d.ts"],
}
);
Loading
Loading