Skip to content

Commit 47dfa51

Browse files
committed
Merge branch 'release/0.3.0'
2 parents 75bc998 + 7ac199d commit 47dfa51

26 files changed

+725
-428
lines changed

.build.ps1

Lines changed: 35 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,35 @@
1-
<#
2-
.Synopsis
3-
Build script <https://github.com/nightroman/Invoke-Build>
4-
#>
5-
6-
param(
7-
[ValidateSet('Debug', 'Release')]
8-
[string] $Configuration = 'Debug',
9-
10-
[string] $NuGetApiKey = $env:nuget_apikey,
11-
12-
# Overwrite published versions
13-
[switch] $ForcePublish,
14-
15-
# Version suffix to prereleases
16-
[int] $BuildNumber
17-
)
18-
19-
$ModuleName = 'PsCosmos'
20-
21-
. $PSScriptRoot\tasks\Build.Tasks.ps1
1+
<#
2+
.Synopsis
3+
Build script <https://github.com/nightroman/Invoke-Build>
4+
5+
.Example
6+
# Create module from source.
7+
Invoke-Build Build
8+
9+
.Example
10+
# Add doc templates for new command.
11+
# BE CAREFUL! Existing documents will be overwritten and must be discarded using git.
12+
Invoke-Build Doc.Init -ForceDocInit
13+
#>
14+
15+
param(
16+
[ValidateSet('Debug', 'Release')]
17+
[string] $Configuration = 'Debug',
18+
19+
[string] $NuGetApiKey = $env:nuget_apikey,
20+
21+
# Overwrite published versions
22+
[switch] $ForcePublish,
23+
24+
# Add doc templates for new command.
25+
[switch] $ForceDocInit,
26+
27+
# Version suffix to prereleases
28+
[int] $BuildNumber
29+
)
30+
31+
$ModuleName = 'PsCosmos'
32+
33+
. $PSScriptRoot\tasks\Build.Tasks.ps1
34+
. $PSScriptRoot\tasks\Dependency.Tasks.ps1
35+
. $PSScriptRoot\tasks\PsBuild.Tasks.ps1

.github/FUNDING.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# These are supported funding model platforms
2+
3+
github: [abbgrade]

.github/dependabot.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "nuget" # See documentation for possible values
9+
directory: "/src/PsCosmos" # Location of package manifests
10+
schedule:
11+
interval: "daily"
12+
target-branch: "develop"

.github/workflows/build-pages.yml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
on:
2+
# Runs on pushes targeting the default branch
3+
push:
4+
branches: ["main"]
5+
6+
# Allows you to run this workflow manually from the Actions tab
7+
workflow_dispatch:
8+
9+
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
10+
permissions:
11+
contents: read
12+
pages: write
13+
id-token: write
14+
15+
# Allow one concurrent deployment
16+
concurrency:
17+
group: "pages"
18+
cancel-in-progress: true
19+
20+
jobs:
21+
# Build job
22+
build:
23+
runs-on: ubuntu-latest
24+
steps:
25+
- name: Checkout
26+
uses: actions/checkout@v3
27+
- name: Setup Pages
28+
uses: actions/configure-pages@v3
29+
- name: Build with Jekyll
30+
uses: actions/jekyll-build-pages@v1
31+
with:
32+
source: ./
33+
destination: ./_site
34+
- name: Upload artifact
35+
uses: actions/upload-pages-artifact@v1
36+
37+
# Deployment job
38+
deploy:
39+
environment:
40+
name: github-pages
41+
url: ${{ steps.deployment.outputs.page_url }}
42+
runs-on: ubuntu-latest
43+
needs: build
44+
steps:
45+
- name: Deploy to GitHub Pages
46+
id: deployment
47+
uses: actions/deploy-pages@v1
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
on:
2+
push:
3+
branches: [ develop, bugfix/*, feature/*, release/* ]
4+
pull_request:
5+
branches: [ develop ]
6+
7+
jobs:
8+
build-validation:
9+
uses: abbgrade/PsBuildTasks/.github/workflows/build-validation-matrix.yml@1.11.1

.github/workflows/pre-release.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
on:
2+
push:
3+
branches: [ release/*, 'hotfix/*' ]
4+
workflow_dispatch:
5+
6+
jobs:
7+
pre-release:
8+
uses: abbgrade/PsBuildTasks/.github/workflows/pre-release-windows.yml@1.11.1
9+
with:
10+
module-name: PsCosmos
11+
secrets:
12+
ps-gallery-key: ${{ secrets.PS_GALLERY_KEY }}

.github/workflows/prerelease.yml

Lines changed: 0 additions & 41 deletions
This file was deleted.

.github/workflows/release.yml

Lines changed: 5 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,9 @@ on:
44
workflow_dispatch:
55

66
jobs:
7-
build:
8-
runs-on: ubuntu-latest
9-
steps:
10-
- name: Checkout source
11-
uses: actions/checkout@v2
12-
13-
- name: Install build dependencies
14-
shell: pwsh
15-
run: |
16-
Set-PSRepository PSGallery -InstallationPolicy Trusted
17-
Install-Module InvokeBuild, platyPS -ErrorAction Stop
18-
19-
- name: Create build
20-
shell: pwsh
21-
run: Invoke-Build Build -Configuration Release
22-
23-
- name: Upload build
24-
uses: actions/upload-artifact@v2
25-
with:
26-
name: build
27-
path: publish
28-
297
release:
30-
needs: build
31-
runs-on: ubuntu-latest
32-
steps:
33-
- name: Download build artifact
34-
uses: actions/download-artifact@v2
35-
with:
36-
name: build
37-
38-
- name: Publish to PsGallery
39-
shell: pwsh
40-
run: |
41-
Publish-Module -Path ./PsCosmos -NuGetApiKey ${{ secrets.PS_GALLERY_KEY }}
8+
uses: abbgrade/PsBuildTasks/.github/workflows/release-windows.yml@1.11.1
9+
with:
10+
module-name: PsCosmos
11+
secrets:
12+
ps-gallery-key: ${{ secrets.PS_GALLERY_KEY }}

.vscode/launch.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"version": "0.2.0",
3+
"configurations": []
4+
}

.vscode/tasks.json

Lines changed: 24 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
// Do not edit! This file is generated by New-VSCodeTask.ps1
2-
// Modify the build script or tasks-merge.json and recreate.
31
{
2+
// See https://go.microsoft.com/fwlink/?LinkId=733558
3+
// for the documentation about the tasks.json format
44
"version": "2.0.0",
55
"windows": {
66
"options": {
77
"shell": {
88
"executable": "pwsh.exe",
99
"args": [
1010
"-NoProfile",
11+
"-ExecutionPolicy Bypass",
1112
"-NonInteractive",
12-
"-ExecutionPolicy",
13-
"Bypass",
1413
"-Command"
1514
]
1615
}
@@ -20,72 +19,58 @@
2019
"options": {
2120
"shell": {
2221
"executable": "/usr/bin/pwsh",
23-
"args": [
24-
"-NoProfile",
25-
"-Command"
26-
]
22+
"args": [ "-NoProfile", "-Command" ]
2723
}
2824
}
2925
},
3026
"osx": {
3127
"options": {
3228
"shell": {
3329
"executable": "/usr/local/bin/pwsh",
34-
"args": [
35-
"-NoProfile",
36-
"-Command"
37-
]
30+
"args": [ "-NoProfile", "-Command" ]
3831
}
3932
}
4033
},
4134
"tasks": [
4235
{
4336
"label": "Build",
44-
"group": "build",
4537
"type": "shell",
46-
"command": "Invoke-Build -Task Build",
47-
"problemMatcher": "$msCompile",
48-
"presentation": {
49-
"echo": false,
50-
"showReuseMessage": false
51-
}
38+
"group": "build",
39+
"command": "Invoke-Build Build",
40+
"problemMatcher": []
5241
},
5342
{
5443
"label": "Clean",
5544
"type": "shell",
56-
"command": "Invoke-Build -Task Clean",
57-
"problemMatcher": "$msCompile",
58-
"presentation": {
59-
"echo": false,
60-
"showReuseMessage": false
61-
}
45+
"command": "Invoke-Build Clean",
46+
"problemMatcher": []
47+
},
48+
{
49+
"label": "Install",
50+
"type": "shell",
51+
"command": "Invoke-Build Install",
52+
"problemMatcher": []
53+
},
54+
{
55+
"label": "Update docs",
56+
"type": "shell",
57+
"command": "Invoke-Build UpdateDocs",
58+
"problemMatcher": []
6259
},
6360
{
6461
"label": "Test",
6562
"group": "test",
6663
"type": "shell",
6764
"command": "Invoke-Pester",
68-
"args": ["-Output", "Detailed"],
6965
"options": {
70-
"cwd": "test"
66+
"cwd": "${workspaceFolder}/test"
7167
},
7268
"problemMatcher": "$msCompile",
7369
"presentation": {
7470
"echo": false,
7571
"showReuseMessage": false
7672
},
7773
"dependsOn": "Build"
78-
},
79-
{
80-
"label": "Install",
81-
"type": "shell",
82-
"command": "Invoke-Build",
83-
"args": ["Install", "-Configuration", "Release"],
84-
"problemMatcher": "$msCompile",
85-
"presentation": {
86-
"echo": false,
87-
"showReuseMessage": false
88-
}
8974
}
9075
]
91-
}
76+
}

0 commit comments

Comments
 (0)