Skip to content

Commit

Permalink
Merge pull request #1287 from Badgerati/develop
Browse files Browse the repository at this point in the history
v2.10.0
  • Loading branch information
Badgerati authored Apr 15, 2024
2 parents b6d0cc6 + e0ac3e2 commit 241b7ca
Show file tree
Hide file tree
Showing 184 changed files with 35,581 additions and 6,940 deletions.
49 changes: 49 additions & 0 deletions .github/workflows/PSScriptAnalyzer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.
#
# https://github.com/microsoft/action-psscriptanalyzer
# For more information on PSScriptAnalyzer in general, see
# https://github.com/PowerShell/PSScriptAnalyzer

name: PSScriptAnalyzer

on:
push:
branches: [ "develop" ]
pull_request:
branches: [ "develop" ]
schedule:
- cron: '20 16 * * 6'

permissions:
contents: read

jobs:
build:
permissions:
contents: read # for actions/checkout to fetch code
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
name: PSScriptAnalyzer
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Run PSScriptAnalyzer
uses: microsoft/psscriptanalyzer-action@6b2948b1944407914a58661c49941824d149734f
with:
# Check https://github.com/microsoft/action-psscriptanalyzer for more info about the options.
# The below set up runs PSScriptAnalyzer to your entire repository and runs some basic security rules.
path: .\
recurse: true
# Include your own basic security rules. Removing this option will run all the rules
includeRule: '"PSAvoidUsingCmdletAliases" ,"PSAvoidUsingPlainTextForPassword","PSAvoidUsingWriteHost","PSAvoidUsingInvokeExpression","PSUseShouldProcessForStateChangingFunctions","PSAvoidUsingUsernameAndPasswordParams","PSUseProcessBlockForPipelineCommand","PSAvoidUsingConvertToSecureStringWithPlainText","PSUseSingularNouns","PSReviewUnusedParameter"'
output: results.sarif

# Upload the SARIF file generated in the previous step
- name: Upload SARIF results file
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: results.sarif
16 changes: 12 additions & 4 deletions .github/workflows/ci-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,27 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4

- name: Check PowerShell version
shell: pwsh
run: |
$PSVersionTable.PSVersion
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x

- name: Install Invoke-Build
shell: pwsh
run: |
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
Install-Module -Name InvokeBuild -RequiredVersion '5.5.1' -Force
Install-Module -Name InvokeBuild -RequiredVersion '5.10.5' -Force
- name: Run Pester Tests
shell: pwsh
env:
PODE_COVERALLS_TOKEN: ${{ secrets.PODE_COVERALLS_TOKEN }}
PODE_RUN_CODE_COVERAGE: false
run: |
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
Invoke-Build Test
43 changes: 43 additions & 0 deletions .github/workflows/ci-powershell.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Pode CI - Powershell Desktop

on:
push:
branches:
- '*'
- '!gh-pages'
pull_request:
branches:
- '*'

jobs:
build:

runs-on: windows-latest

strategy:
fail-fast: false

steps:
- uses: actions/checkout@v4

- name: Check PowerShell version
shell: powershell
run: |
$PSVersionTable.PSVersion
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x

- name: Install Invoke-Build
shell: powershell
run: |
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
Install-Module -Name InvokeBuild -RequiredVersion '5.10.5' -Force
- name: Run Pester Tests
shell: powershell
run: |
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
Invoke-Build Test
53 changes: 53 additions & 0 deletions .github/workflows/ci-pwsh7_2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: Pode CI - pwsh 7.2

on:
push:
branches:
- '*'
- '!gh-pages'
pull_request:
branches:
- '*'

jobs:
build:

runs-on: ${{ matrix.os }}

strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macOS-latest]

steps:
- uses: actions/checkout@v4

- name: Setup Powershell
uses: bjompen/[email protected]
with:
FixedVersion: '7.2.18'

- name: Check PowerShell version
shell: pwsh
run: |
$PSVersionTable.PSVersion
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x

- name: Install Invoke-Build
shell: pwsh
run: |
Install-Module -Name InvokeBuild -RequiredVersion '5.10.5' -Force
- name: Run Pester Tests
shell: pwsh
run: |
Invoke-Build Test
- name: Test docker builds
shell: pwsh
run: |
Invoke-Build DockerPack -Version '0.0.0'
53 changes: 53 additions & 0 deletions .github/workflows/ci-pwsh7_3.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: Pode CI - pwsh 7.3

on:
push:
branches:
- '*'
- '!gh-pages'
pull_request:
branches:
- '*'

jobs:
build:

runs-on: ${{ matrix.os }}

strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macOS-latest]

steps:
- uses: actions/checkout@v4

- name: Setup Powershell
uses: bjompen/[email protected]
with:
FixedVersion: '7.3.11'

- name: Check PowerShell version
shell: pwsh
run: |
$PSVersionTable.PSVersion
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x

- name: Install Invoke-Build
shell: pwsh
run: |
Install-Module -Name InvokeBuild -RequiredVersion '5.10.5' -Force
- name: Run Pester Tests
shell: pwsh
run: |
Invoke-Build Test
- name: Test docker builds
shell: pwsh
run: |
Invoke-Build DockerPack -Version '0.0.0'
53 changes: 53 additions & 0 deletions .github/workflows/ci-pwsh_lts.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: Pode CI - pwsh lts

on:
push:
branches:
- '*'
- '!gh-pages'
pull_request:
branches:
- '*'

jobs:
build:

runs-on: ${{ matrix.os }}

strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macOS-latest]

steps:
- uses: actions/checkout@v4

- name: Setup Powershell
uses: bjompen/[email protected]
with:
ReleaseVersion: 'lts'

- name: Check PowerShell version
shell: pwsh
run: |
$PSVersionTable.PSVersion
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x

- name: Install Invoke-Build
shell: pwsh
run: |
Install-Module -Name InvokeBuild -RequiredVersion '5.10.5' -Force
- name: Run Pester Tests
shell: pwsh
run: |
Invoke-Build Test
- name: Test docker builds
shell: pwsh
run: |
Invoke-Build DockerPack -Version '0.0.0'
24 changes: 16 additions & 8 deletions .github/workflows/ci.yml → .github/workflows/ci-pwsh_preview.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Pode CI
name: Pode CI - pwsh preview

on:
push:
Expand All @@ -20,23 +20,31 @@ jobs:
os: [ubuntu-latest, windows-latest, macOS-latest]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup Powershell
uses: bjompen/[email protected]
with:
ReleaseVersion: 'Preview'

- name: Check PowerShell version
shell: pwsh
run: |
$PSVersionTable.PSVersion
- name: Setup .NET
uses: actions/setup-dotnet@v1.9.0
uses: actions/setup-dotnet@v4
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x

- name: Install Invoke-Build
shell: pwsh
run: |
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
Install-Module -Name InvokeBuild -RequiredVersion '5.5.1' -Force
Install-Module -Name InvokeBuild -RequiredVersion '5.10.5' -Force
- name: Run Pester Tests
shell: pwsh
run: |
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
run: |
Invoke-Build Test
- name: Test docker builds
Expand Down
12 changes: 9 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ examples/state.json
examples/issue-*
examples/issues/
pkg/
deliverable/
.vs/


# Code Runner
tempCodeRunnerFile.ps1

Expand Down Expand Up @@ -189,7 +189,6 @@ ClientBin/
*.publishsettings
node_modules/


# RIA/Silverlight projects
Generated_Code/

Expand Down Expand Up @@ -258,4 +257,11 @@ $RECYCLE.BIN/
*.msp

# Windows shortcuts
*.lnk
*.lnk
.vscode/launch.json
Pode.sln
examples/FileBrowser/wwwFiles/
examples/PetStore/data/PetData.json

packers/choco/pode.nuspec
packers/choco/tools/ChocolateyInstall.ps1
14 changes: 13 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,17 @@
"powershell.codeFormatting.whitespaceBeforeOpenParen": true,
"powershell.codeFormatting.whitespaceBetweenParameters": false,
"powershell.codeFormatting.whitespaceInsideBrace": true,
"files.trimTrailingWhitespace": true
"powershell.scriptAnalysis.settingsPath": "PSScriptAnalyzerSettings.psd1",
"files.trimTrailingWhitespace": true,
"files.associations": {
"*.pode": "html"
},
"[html]": {
"editor.formatOnSave": false
},
"javascript.format.insertSpaceAfterCommaDelimiter": true,
"javascript.format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": false,
"javascript.format.insertSpaceAfterKeywordsInControlFlowStatements": true,
"javascript.format.insertSpaceBeforeAndAfterBinaryOperators": true,
"javascript.format.insertSpaceBeforeFunctionParenthesis": false
}
Loading

0 comments on commit 241b7ca

Please sign in to comment.