Skip to content

Commit 3233697

Browse files
Merge pull request #73 from leojonathanoh/enhancement/ci-bump-psmodulepublisher-to-v0.8.1
Enhancement (ci): Bump PSModulePublisher to v0.8.1
2 parents 7465b0a + 9d6cad6 commit 3233697

File tree

3 files changed

+10
-19
lines changed

3 files changed

+10
-19
lines changed

.github/workflows/ci-master-pr.yml

+6-15
Original file line numberDiff line numberDiff line change
@@ -169,12 +169,9 @@ jobs:
169169
NUGET_API_KEY: 'xxx'
170170
run: |
171171
$ErrorActionPreference = 'Stop'
172-
173-
# Generate the new module manifest
174-
$moduleManifest = ./build/PSModulePublisher/src/PSModulePublisher/Public/Invoke-Build.ps1
175-
176-
# Publish the module
177-
./build/PSModulePublisher/src/PSModulePublisher/Public/Invoke-Publish.ps1 -ModuleManifestPath $moduleManifest -Repository PSGallery -DryRun
172+
Import-Module ./build/PSModulePublisher/src/PSModulePublisher -Force
173+
$moduleManifest = Invoke-Build
174+
Invoke-Publish -ModuleManifestPath $moduleManifest -Repository PSGallery -DryRun
178175
179176
publish-to-psgallery:
180177
needs:
@@ -203,15 +200,9 @@ jobs:
203200
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
204201
run: |
205202
$ErrorActionPreference = 'Stop'
206-
207-
# Strip of 'v' prefix from tag
208-
$env:MODULE_VERSION = $env:GITHUB_REF_NAME -replace '^v', ''
209-
210-
# Generate the new module manifest
211-
$moduleManifest = ./build/PSModulePublisher/src/PSModulePublisher/Public/Invoke-Build.ps1
212-
213-
# Publish the module
214-
./build/PSModulePublisher/src/PSModulePublisher/Public/Invoke-Publish.ps1 -ModuleManifestPath $moduleManifest -Repository PSGallery
203+
Import-Module ./build/PSModulePublisher/src/PSModulePublisher -Force
204+
$moduleManifest = Invoke-Build
205+
Invoke-Publish -ModuleManifestPath $moduleManifest -Repository PSGallery
215206
216207
publish-draft-release:
217208
needs: [publish-to-psgallery]

.vscode/tasks.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
{
3333
"label": "Build: Generate module manifest",
3434
"type": "shell",
35-
"command": "MODULE_VERSION=${input:MODULE_VERSION} pwsh build/PSModulePublisher/src/PSModulePublisher/Public/Invoke-Build.ps1",
35+
"command": "MODULE_VERSION=${input:MODULE_VERSION} pwsh -Command '$ErrorActionPreference = \"Stop\"; Import-Module ./build/PSModulePublisher/src/PSModulePublisher -Force; $moduleManifest = Invoke-Build'",
3636
"group": "build"
3737
},
3838
{
@@ -41,7 +41,7 @@
4141
"Build: Generate module manifest"
4242
],
4343
"type": "shell",
44-
"command": "MODULE_NAME=$(basename $(pwd)); NUGET_API_KEY=${input:NUGET_API_KEY} MODULE_VERSION=${input:MODULE_VERSION} pwsh build/PSModulePublisher/src/PSModulePublisher/Public/Invoke-Publish.ps1 -ModuleManifestPath src/$MODULE_NAME/$MODULE_NAME.psd1 -Repository PSGallery -DryRun",
44+
"command": "NUGET_API_KEY=${input:NUGET_API_KEY} MODULE_VERSION=${input:MODULE_VERSION} pwsh -Command '$ErrorActionPreference = \"Stop\"; Import-Module ./build/PSModulePublisher/src/PSModulePublisher -Force; $moduleManifest = Invoke-Build; Invoke-Publish -ModuleManifestPath $moduleManifest -Repository PSGallery -DryRun'",
4545
"group": "build"
4646
},
4747
{
@@ -50,7 +50,7 @@
5050
"Build: Generate module manifest"
5151
],
5252
"type": "shell",
53-
"command": "MODULE_NAME=$(basename $(pwd)); NUGET_API_KEY=${input:NUGET_API_KEY} MODULE_VERSION=${input:MODULE_VERSION} pwsh build/PSModulePublisher/src/PSModulePublisher/Public/Invoke-Publish.ps1 -ModuleManifestPath src/$MODULE_NAME/$MODULE_NAME.psd1 -Repository PSGallery",
53+
"command": "NUGET_API_KEY=${input:NUGET_API_KEY} MODULE_VERSION=${input:MODULE_VERSION} pwsh -Command '$ErrorActionPreference = \"Stop\"; Import-Module ./build/PSModulePublisher/src/PSModulePublisher -Force; $moduleManifest = Invoke-Build; Invoke-Publish -ModuleManifestPath $moduleManifest -Repository PSGallery'",
5454
"group": "build"
5555
},
5656

build/PSModulePublisher

Submodule PSModulePublisher updated 35 files

0 commit comments

Comments
 (0)