Skip to content

Commit 3f124c1

Browse files
authored
Fixes
1 parent 191c073 commit 3f124c1

7 files changed

Lines changed: 31 additions & 10 deletions

File tree

.github/dependabot.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ updates:
3737
codeql-actions:
3838
patterns:
3939
- 'github/codeql-action/*' # group github/codeql-action/* actions for Dependabot to update these together in one PR
40+
standard-actions:
41+
patterns:
42+
- 'actions/*' # group actions/* actions for Dependabot to update these together in one PR
4043
# Maintain dependencies for Python
4144
- package-ecosystem: pip
4245
directory: '/'

.github/workflows/build.yaml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,19 @@ jobs:
121121
name: Install dependencies (PowerShell)
122122
shell: pwsh
123123
timeout-minutes: 3
124-
run: ./scripts/pipeline-deps.ps1
124+
run: |
125+
./scripts/pipeline-deps.ps1;
126+
Import-Module ./scripts/dependencies.psm1 -Force;
127+
Install-Dependencies -Dev -Repository 'PSGallery' -TrustRepository;
125128
126129
- if: ${{ matrix.shell == 'powershell' }}
127130
name: Install dependencies (Windows PowerShell)
128131
shell: powershell
129-
timeout-minutes: 3
130-
run: ./scripts/pipeline-deps.ps1
132+
timeout-minutes: 5
133+
run: |
134+
./scripts/pipeline-deps.ps1;
135+
Import-Module ./scripts/dependencies.psm1 -Force;
136+
Install-Dependencies -Dev -Repository 'PSGallery' -TrustRepository;
131137
132138
- name: Download module
133139
uses: actions/download-artifact@v8
@@ -173,7 +179,10 @@ jobs:
173179
- name: Install dependencies (PowerShell)
174180
shell: pwsh
175181
timeout-minutes: 3
176-
run: ./scripts/pipeline-deps.ps1
182+
run: |
183+
./scripts/pipeline-deps.ps1;
184+
Import-Module ./scripts/dependencies.psm1 -Force;
185+
Install-Dependencies -Dev -Repository 'PSGallery' -TrustRepository;
177186
178187
- name: Build docs
179188
shell: pwsh

.github/workflows/copilot-setup-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ jobs:
4040
dotnet restore;
4141
./scripts/pipeline-deps.ps1;
4242
Import-Module ./scripts/dependencies.psm1 -Force;
43-
Install-Dependencies -Dev;
43+
Install-Dependencies -Dev -Repository 'PSGallery' -TrustRepository;

pipeline.build.ps1

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,13 @@ if ($Env:BUILD_SOURCEBRANCH -like '*/tags/*' -and $Env:BUILD_SOURCEBRANCHNAME -l
4949
$Build = $Env:BUILD_SOURCEBRANCHNAME.Substring(1);
5050
}
5151

52+
$PSUpstream = 'PSGallery';
53+
if ($Env:PSUPSTREAM -ne $Null -and $Env:PSUPSTREAM -ne '') {
54+
$PSUpstream = $Env:PSUPSTREAM;
55+
}
56+
57+
Write-Host -Object "[Pipeline] -- Using PSUpstream: $PSUpstream" -ForegroundColor Green;
58+
5259
$version = $Build;
5360
$versionSuffix = [String]::Empty;
5461

@@ -560,7 +567,7 @@ task Benchmark {
560567

561568
task Dependencies NuGet, {
562569
Import-Module $PWD/scripts/dependencies.psm1;
563-
Install-Dependencies -Path $PWD/modules.json -Dev;
570+
Install-Dependencies -Path $PWD/modules.json -Dev -Repository $PSUpstream;
564571
}
565572

566573
task ExportData {

requirements-docs.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
mkdocs==1.6.1
22
mkdocs-material==9.7.7
3-
pymdown-extensions==11.0.1
3+
pymdown-extensions==11.0.2
44
mike==2.2.0
5-
mkdocs-git-revision-date-localized-plugin==1.5.3
5+
mkdocs-git-revision-date-localized-plugin==1.5.4
66
mkdocs-git-committers-plugin-2==2.5.0
77
mdx-truly-sane-lists==1.3
88
mkdocs-redirects==1.2.3
99
semver==3.0.4
10-
pygments==2.20.0
10+
pygments==2.21.0
1111
./packages/bicep-syntax

tests/PSRule.Rules.Azure.Tests/Azure.APIM.Tests.ps1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,8 @@ Describe 'Azure.APIM' -Tag 'APIM' {
274274
$filteredResult = $result | Where-Object { $_.RuleName -eq 'Azure.APIM.CertificateExpiry' };
275275

276276
# Fail
277+
# Note: Certificate for apim-p fails every year in August, which is but design.
278+
# Bump the certificate expiry one year in Resources.APIM.json to fix the test.
277279
$ruleResult = @($filteredResult | Where-Object { $_.Outcome -eq 'Fail' });
278280
$ruleResult | Should -Not -BeNullOrEmpty;
279281
$ruleResult.TargetName | Should -Be 'apim-C', 'apim-D', 'apim-E', 'apim-F', 'apim-G', 'apim-H', 'apim-I', 'apim-J', 'apim-K', 'apim-L', 'apim-M', 'apim-N', 'apim-O';

tests/PSRule.Rules.Azure.Tests/Resources.APIM.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3061,7 +3061,7 @@
30613061
"certificatePassword": null,
30623062
"negotiateClientCertificate": false,
30633063
"certificate": {
3064-
"expiry": "2026-09-01T12:00:00+00:00",
3064+
"expiry": "2027-09-01T12:00:00+00:00",
30653065
"thumbprint": "0000000000000000000000000000000000000000",
30663066
"subject": "CN=api.contoso.com, OU=A, O=O, L=L, S=S, C=C"
30673067
},

0 commit comments

Comments
 (0)