Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into state-threadsafe
Browse files Browse the repository at this point in the history
  • Loading branch information
mdaneri committed Nov 23, 2024
2 parents 2f20091 + 7a2cf53 commit a8bd085
Show file tree
Hide file tree
Showing 11 changed files with 853 additions and 121 deletions.
10 changes: 10 additions & 0 deletions .github/workflows/VirusTotal-Releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,16 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Check VIRUSTOTAL_API_KEY
env:
VIRUSTOTAL_API_KEY: ${{ secrets.VIRUSTOTAL_API_KEY }}
run: |
if [ -z "$VIRUSTOTAL_API_KEY" ]; then
echo "VIRUSTOTAL_API_KEY is not set. Exiting workflow."
exit 1
fi
echo "VIRUSTOTAL_API_KEY is set. Proceeding with the workflow."
- name: Run VirusTotal Scan
uses: crazy-max/ghaction-virustotal@v4
with:
Expand Down
15 changes: 13 additions & 2 deletions .github/workflows/VirusTotal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,25 @@ on:
- cron: '0 12 * * *'

env:
INVOKE_BUILD_VERSION: '5.11.1'
INVOKE_BUILD_VERSION: '5.12.0'
POWERSHELL_VERSION: 'lts'

jobs:
build:
runs-on: ubuntu-latest

steps:


- name: Check VIRUSTOTAL_API_KEY
env:
VIRUSTOTAL_API_KEY: ${{ secrets.VIRUSTOTAL_API_KEY }}
run: |
if [ -z "$VIRUSTOTAL_API_KEY" ]; then
echo "VIRUSTOTAL_API_KEY is not set. Exiting workflow."
exit 1
fi
echo "VIRUSTOTAL_API_KEY is set. Proceeding with the workflow."
- uses: actions/checkout@v4

- name: Setup .NET
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:
- '.github/workflows/ci-coverage.yml'

env:
INVOKE_BUILD_VERSION: '5.11.1'
INVOKE_BUILD_VERSION: '5.12.0'

jobs:
build:
Expand All @@ -37,7 +37,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
dotnet-version: 9.x

- name: Install Invoke-Build
shell: pwsh
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/ci-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ on:
- 'src/Pode.psd1'

env:
INVOKE_BUILD_VERSION: '5.11.1'
INVOKE_BUILD_VERSION: '5.12.0'

jobs:
build:
Expand All @@ -36,6 +36,11 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 9.x

- name: Install Invoke-Build
shell: pwsh
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-powershell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:
- '.github/workflows/ci-powershell.yml'

env:
INVOKE_BUILD_VERSION: '5.11.1'
INVOKE_BUILD_VERSION: '5.12.0'

jobs:
build:
Expand All @@ -40,7 +40,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
dotnet-version: 9.x

- name: Install Invoke-Build
shell: powershell
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Pode CI - pwsh 7.2
name: Pode CI - pwsh 7.5

on:
push:
Expand All @@ -9,7 +9,7 @@ on:
- 'src/**'
- 'tests/**'
- 'pode.build.ps1'
- '.github/workflows/ci-pwsh7_2.yml'
- '.github/workflows/ci-pwsh7_5.yml'
- 'Dockerfile'
- '*.dockerfile'
pull_request:
Expand All @@ -19,13 +19,14 @@ on:
- 'src/**'
- 'tests/**'
- 'pode.build.ps1'
- '.github/workflows/ci-pwsh7_2.yml'
- '.github/workflows/ci-pwsh7_5.yml'
- 'Dockerfile'
- '*.dockerfile'

env:
INVOKE_BUILD_VERSION: '5.11.1'
POWERSHELL_VERSION: '7.2.24'
INVOKE_BUILD_VERSION: '5.12.0'
POWERSHELL_VERSION: '7.5.0-rc.1'


jobs:
build:
Expand All @@ -42,7 +43,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
dotnet-version: 9.x

- name: Setup Powershell - Unix
shell: pwsh
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-pwsh_lts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ on:
- '*.dockerfile'

env:
INVOKE_BUILD_VERSION: '5.11.1'
INVOKE_BUILD_VERSION: '5.12.0'
POWERSHELL_VERSION: 'lts'

jobs:
Expand All @@ -42,7 +42,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
dotnet-version: 9.x

- name: Setup Powershell - Unix
shell: pwsh
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-pwsh_preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ on:
- '*.dockerfile'

env:
INVOKE_BUILD_VERSION: '5.11.1'
INVOKE_BUILD_VERSION: '5.12.0'
POWERSHELL_VERSION: 'Preview'

jobs:
Expand All @@ -42,7 +42,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
dotnet-version: 9.x

- name: Setup Powershell - Unix
shell: pwsh
Expand Down
2 changes: 1 addition & 1 deletion alpine.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/powershell:7.4-alpine-3.17
FROM mcr.microsoft.com/powershell:7.4-alpine-3.20
LABEL maintainer="Matthew Kelly (Badgerati)"
RUN mkdir -p /usr/local/share/powershell/Modules/Pode
COPY ./pkg/ /usr/local/share/powershell/Modules/Pode
Loading

0 comments on commit a8bd085

Please sign in to comment.