Skip to content

Commit 158611d

Browse files
authored
Fixes import of pre-release version #138 (#139)
* Fixes import of pre-release version #138 * Allow pre-releases
1 parent 9672f36 commit 158611d

File tree

4 files changed

+40
-6
lines changed

4 files changed

+40
-6
lines changed

.github/workflows/build.yaml

+34-3
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,49 @@
11
# CI workflow for validating action
22
name: Build
33
on:
4-
- pull_request
5-
- push
4+
push:
5+
branches: [ main, 'release/*' ]
6+
pull_request:
7+
branches: [ main, 'release/*' ]
8+
69
jobs:
10+
11+
test:
12+
name: 'Tests'
13+
runs-on: ubuntu-latest
14+
permissions:
15+
contents: read
16+
steps:
17+
18+
- name: Checkout
19+
uses: actions/[email protected]
20+
21+
- name: Run PSRule v1
22+
uses: ./
23+
with:
24+
inputType: repository
25+
modules: PSRule.Rules.MSFT.OSS
26+
27+
- name: Run PSRule v2
28+
uses: ./
29+
with:
30+
inputType: repository
31+
modules: PSRule.Rules.MSFT.OSS
32+
prerelease: true
33+
version: '2.0.0-B2202017'
34+
735
run:
836
name: Analyze repository
937
runs-on: ubuntu-latest
38+
needs: 'test'
39+
permissions:
40+
contents: read
1041
steps:
1142

1243
- name: Checkout
1344
uses: actions/[email protected]
1445

15-
- name: Run PSRule analysis
46+
- name: Run PSRule self analysis
1647
uses: ./
1748
with:
1849
inputType: repository

docs/CHANGELOG-v1.md

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ What's changed since v1.12.0:
1818
To configure this:
1919
- Set the `prerelease` parameter to `true` to include pre-release versions.
2020
- Set the `version` parameter to `2.0.0-B2201161` or newer version.
21+
- Bug fixes:
22+
- Fixed import of pre-release version. [#138](https://github.com/microsoft/ps-rule/issues/138)
2123

2224
## v1.12.0
2325

powershell.ps1

+3-2
Original file line numberDiff line numberDiff line change
@@ -179,17 +179,18 @@ foreach ($m in $moduleNames) {
179179
}
180180
}
181181
catch {
182-
Write-Host "::error::An error occured installing a dependency module '$m'.";
182+
Write-Host "::error::An error occurred installing a dependency module '$m'. $($_.Exception.Message)";
183183
$Host.SetShouldExit(1);
184184
}
185185
}
186186

187187
try {
188+
$checkParams = @{ RequiredVersion = $checkParams.RequiredVersion.Split('-')[0] }
188189
$Null = Import-Module PSRule @checkParams -ErrorAction Stop;
189190
$version = (Get-Module PSRule).Version;
190191
}
191192
catch {
192-
Write-Host "::error::An error occured importing module 'PSRule'.";
193+
Write-Host "::error::An error occurred importing module 'PSRule'. $($_.Exception.Message)";
193194
$Host.SetShouldExit(1);
194195
}
195196

ps-rule.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# https://microsoft.github.io/PSRule/
77

88
requires:
9-
PSRule: '>=1.11.0'
9+
PSRule: '@pre >=1.11.0'
1010

1111
output:
1212
culture:

0 commit comments

Comments
 (0)