Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/apply-vipc-self-hosted.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
"vip_lv_version": "2021",
"supported_bitness": "64",
"relative_path": ".",
"vipc_path": "scripts/apply-vipc/runner_dependencies.vipc",
"vipm_toml": "scripts/apply-vipc/vipm.toml",
"dry_run": true
}
}
]
}
}
}
}
2 changes: 1 addition & 1 deletion .github/workflows/apply-vipc-self-hosted.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ jobs:
vip_lv_version: '2021'
supported_bitness: '64'
relative_path: '.'
vipc_path: 'scripts/apply-vipc/runner_dependencies.vipc'
vipm_toml: 'scripts/apply-vipc/vipm.toml'
dry_run: true
7 changes: 6 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ jobs:
- run: npm run link:check
- run: npm run derive:registry
- run: git diff --exit-code -- dispatchers.json
- run: npm run check:traceability
ps-ci:
needs: release-check
strategy:
Expand All @@ -56,6 +55,7 @@ jobs:
runs-on: self-hosted-windows-lv
runner_type: default
runs-on: ${{ matrix.runs-on }}
timeout-minutes: 30
env:
RUNNER_TYPE: ${{ matrix.runner_type }}
steps:
Expand Down Expand Up @@ -85,6 +85,10 @@ jobs:
run: |
if (-not (Get-Module -ListAvailable -Name Pester |
Where-Object { $_.Version -ge [Version]'5.7.1' })) {
if (-not (Get-PackageProvider -Name NuGet -ListAvailable -ErrorAction SilentlyContinue)) {
Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force -Scope CurrentUser
}
Set-PSRepository -Name PSGallery -InstallationPolicy Trusted
Remove-Module Pester -ErrorAction SilentlyContinue
Install-Module -Name Pester -RequiredVersion 5.7.1 -Scope CurrentUser -Force -SkipPublisherCheck
}
Expand Down Expand Up @@ -132,6 +136,7 @@ jobs:
DISPATCHER_REGISTRY: dispatchers.json
EVIDENCE_DIR: artifacts/evidence
- run: npx tsx scripts/generate-traceability-matrix.ts
- run: npm run check:traceability
- run: cat artifacts/linux/traceability-matrix.md >> "$GITHUB_STEP_SUMMARY"
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
if: ${{ (success() || failure()) && !cancelled() }}
Expand Down
25 changes: 25 additions & 0 deletions .github/workflows/vipm-lock-refresh.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Refresh VIPM Lock

on:
workflow_dispatch:

jobs:
refresh-vipm-lock:
runs-on: windows-latest
steps:
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955
- name: Generate or refresh vipm.lock
shell: pwsh
env:
VIPM_SERIAL_NUMBER: ${{ secrets.VIPM_SERIAL_NUMBER }}
VIPM_FULL_NAME: ${{ secrets.VIPM_FULL_NAME }}
VIPM_EMAIL: ${{ secrets.VIPM_EMAIL }}
run: |
$ErrorActionPreference = 'Stop'
scripts/vipm-common/New-VipmLock.ps1 -VipmToml 'scripts/apply-vipc/vipm.toml'
- name: Upload vipm.lock artifact
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
with:
name: vipm-lock
path: 'scripts/apply-vipc/vipm.lock'
if-no-files-found: error
24 changes: 24 additions & 0 deletions actions/OpenSourceActions.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ function Invoke-AddTokenToLabVIEW {
# SupportedBitness: Target LabVIEW bitness (32- or 64-bit).
# RelativePath: Normalized path to the project root relative to the working directory.
# VIPCPath: Optional path to the VIPC file.
# VipmToml: Optional path to a VIPM TOML manifest used to install dependencies via the VIPM CLI.
# VipmLock: Optional path to a VIPM lock file verified against the manifest before install.
# DryRun: If set, prints the command instead of executing it.
# gcliPath: Optional path prepended to PATH for locating the g CLI.
function Invoke-ApplyVIPC {
Expand All @@ -76,6 +78,8 @@ function Invoke-ApplyVIPC {
[Parameter(Mandatory)] [string] $SupportedBitness,
[Parameter(Mandatory)] [string] $RelativePath,
[Parameter()] [string] $VIPCPath,
[Parameter()] [string] $VipmToml,
[Parameter()] [string] $VipmLock,
[Parameter()] [switch] $DryRun,
[Parameter()] [string] $gcliPath
)
Expand All @@ -86,6 +90,8 @@ function Invoke-ApplyVIPC {
SupportedBitness = $SupportedBitness
RelativePath = $RelativePath
VIPCPath = $VIPCPath
VipmToml = $VipmToml
VipmLock = $VipmLock
}
return Invoke-OpenSourceActionScript -ScriptSegments @('apply-vipc','ApplyVIPC.ps1') -Arguments $args -DryRun:$DryRun -gcliPath $gcliPath
}
Expand Down Expand Up @@ -241,6 +247,8 @@ function Invoke-BuildLvlibp {
# Commit: Commit hash or identifier (optional).
# DockerImage: Docker image name (default: "nationalinstruments/labview").
# ImageTag: Docker image tag (defaults to "2026q1-linux").
# VipmToml: Optional path to a VIPM TOML manifest used to install dependencies via the VIPM CLI.
# VipmLock: Optional path to a VIPM lock file verified against the manifest before install.
# DryRun: If set, prints the command instead of executing it.
# gcliPath: Optional path prepended to PATH for locating the g CLI.
function Invoke-BuildSpecDockerLinux {
Expand All @@ -258,6 +266,8 @@ function Invoke-BuildSpecDockerLinux {
[Parameter()] [string] $Commit = "",
[Parameter()] [string] $DockerImage = "nationalinstruments/labview",
[Parameter()] [string] $ImageTag = "2026q1-linux",
[Parameter()] [string] $VipmToml = "",
[Parameter()] [string] $VipmLock = "",
[switch] $DryRun,
[string] $gcliPath
)
Expand All @@ -278,6 +288,8 @@ function Invoke-BuildSpecDockerLinux {
Commit = $Commit
DockerImage = $DockerImage
ImageTag = $ImageTag
VipmToml = $VipmToml
VipmLock = $VipmLock
} `
-DryRun:$DryRun `
-gcliPath $gcliPath
Expand All @@ -298,6 +310,8 @@ function Invoke-BuildSpecDockerLinux {
# Commit: Commit hash or identifier (optional).
# DockerImage: Docker image name (default: "nationalinstruments/labview").
# ImageTag: Docker image tag (defaults to "2026q1-windows").
# VipmToml: Optional path to a VIPM TOML manifest used to install dependencies via the VIPM CLI.
# VipmLock: Optional path to a VIPM lock file verified against the manifest before install.
# DryRun: If set, prints the command instead of executing it.
# gcliPath: Optional path prepended to PATH for locating the g CLI.
function Invoke-BuildSpecDockerWindows {
Expand All @@ -315,6 +329,8 @@ function Invoke-BuildSpecDockerWindows {
[Parameter()] [string] $Commit = "",
[Parameter()] [string] $DockerImage = "nationalinstruments/labview",
[Parameter()] [string] $ImageTag = "2026q1-windows",
[Parameter()] [string] $VipmToml = "",
[Parameter()] [string] $VipmLock = "",
[switch] $DryRun,
[string] $gcliPath
)
Expand All @@ -335,6 +351,8 @@ function Invoke-BuildSpecDockerWindows {
Commit = $Commit
DockerImage = $DockerImage
ImageTag = $ImageTag
VipmToml = $VipmToml
VipmLock = $VipmLock
} `
-DryRun:$DryRun `
-gcliPath $gcliPath
Expand All @@ -353,6 +371,8 @@ function Invoke-BuildSpecDockerWindows {
# Patch: Patch version component (optional, skips version setting if < 0).
# Build: Build number component (optional, skips version setting if < 0).
# Commit: Commit hash or identifier (optional).
# VipmToml: Optional path to a VIPM TOML manifest used to install dependencies via the VIPM CLI.
# VipmLock: Optional path to a VIPM lock file verified against the manifest before install.
# DryRun: If set, prints the command instead of executing it.
# gcliPath: Optional path prepended to PATH for locating the g CLI.
function Invoke-BuildSpecGithubHostedWindows {
Expand All @@ -368,6 +388,8 @@ function Invoke-BuildSpecGithubHostedWindows {
[Parameter()] [int] $Patch = -1,
[Parameter()] [int] $Build = -1,
[Parameter()] [string] $Commit = "",
[Parameter()] [string] $VipmToml = "",
[Parameter()] [string] $VipmLock = "",
[switch] $DryRun,
[string] $gcliPath
)
Expand All @@ -386,6 +408,8 @@ function Invoke-BuildSpecGithubHostedWindows {
Patch = $Patch
Build = $Build
Commit = $Commit
VipmToml = $VipmToml
VipmLock = $VipmLock
} `
-DryRun:$DryRun `
-gcliPath $gcliPath
Expand Down
8 changes: 8 additions & 0 deletions apply-vipc/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ inputs:
vipc_path:
description: 'Path to the VIPC file.'
required: false
vipm_toml:
description: 'Path to a vipm.toml manifest. When set, dependencies are installed via the VIPM CLI instead of a .vipc.'
required: false
vipm_lock:
description: 'Path to a vipm.lock file to verify against the manifest before install.'
required: false
gcli_path:
description: 'Optional path to the g-cli executable.'
required: false
Expand Down Expand Up @@ -44,6 +50,8 @@ runs:
RelativePath = '${{ inputs.relative_path }}'
}
if ('${{ inputs.vipc_path }}') { $args['VIPCPath'] = '${{ inputs.vipc_path }}' }
if ('${{ inputs.vipm_toml }}') { $args['VipmToml'] = '${{ inputs.vipm_toml }}' }
if ('${{ inputs.vipm_lock }}') { $args['VipmLock'] = '${{ inputs.vipm_lock }}' }
if ('${{ inputs.gcli_path }}') { $args['gcliPath'] = '${{ inputs.gcli_path }}' }
$params = @{
ActionName = 'apply-vipc'
Expand Down
10 changes: 10 additions & 0 deletions build-spec-docker-linux/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,14 @@ inputs:
description: 'Docker image tag.'
required: false
default: '2026q1-linux'
vipm_toml:
description: 'Path to a vipm.toml manifest. When set, dependencies are installed via the VIPM CLI.'
required: false
default: ''
vipm_lock:
description: 'Path to a vipm.lock file to verify against the manifest before install.'
required: false
default: ''
working_directory:
description: 'Working directory where the action will run.'
required: false
Expand Down Expand Up @@ -77,6 +85,8 @@ runs:
if ('${{ inputs.minor }}') { $args['Minor'] = [int]'${{ inputs.minor }}' }
if ('${{ inputs.patch }}') { $args['Patch'] = [int]'${{ inputs.patch }}' }
if ('${{ inputs.build }}') { $args['Build'] = [int]'${{ inputs.build }}' }
if ('${{ inputs.vipm_toml }}') { $args['VipmToml'] = '${{ inputs.vipm_toml }}' }
if ('${{ inputs.vipm_lock }}') { $args['VipmLock'] = '${{ inputs.vipm_lock }}' }

$params = @{
ActionName = 'build-spec-docker-linux'
Expand Down
10 changes: 10 additions & 0 deletions build-spec-docker-windows/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,14 @@ inputs:
description: 'Docker image tag.'
required: false
default: '2026q1-windows'
vipm_toml:
description: 'Path to a vipm.toml manifest. When set, dependencies are installed via the VIPM CLI.'
required: false
default: ''
vipm_lock:
description: 'Path to a vipm.lock file to verify against the manifest before install.'
required: false
default: ''
working_directory:
description: 'Working directory where the action will run.'
required: false
Expand Down Expand Up @@ -77,6 +85,8 @@ runs:
if ('${{ inputs.minor }}') { $args['Minor'] = [int]'${{ inputs.minor }}' }
if ('${{ inputs.patch }}') { $args['Patch'] = [int]'${{ inputs.patch }}' }
if ('${{ inputs.build }}') { $args['Build'] = [int]'${{ inputs.build }}' }
if ('${{ inputs.vipm_toml }}') { $args['VipmToml'] = '${{ inputs.vipm_toml }}' }
if ('${{ inputs.vipm_lock }}') { $args['VipmLock'] = '${{ inputs.vipm_lock }}' }

$params = @{
ActionName = 'build-spec-docker-windows'
Expand Down
10 changes: 10 additions & 0 deletions build-spec-github-hosted-windows/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@ inputs:
description: 'Commit hash or identifier recorded in the build.'
required: false
default: ''
vipm_toml:
description: 'Path to a vipm.toml manifest. When set, dependencies are installed via the VIPM CLI.'
required: false
default: ''
vipm_lock:
description: 'Path to a vipm.lock file to verify against the manifest before install.'
required: false
default: ''
working_directory:
description: 'Working directory where the action will run.'
required: false
Expand Down Expand Up @@ -67,6 +75,8 @@ runs:
if ('${{ inputs.minor }}') { $args['Minor'] = [int]'${{ inputs.minor }}' }
if ('${{ inputs.patch }}') { $args['Patch'] = [int]'${{ inputs.patch }}' }
if ('${{ inputs.build }}') { $args['Build'] = [int]'${{ inputs.build }}' }
if ('${{ inputs.vipm_toml }}') { $args['VipmToml'] = '${{ inputs.vipm_toml }}' }
if ('${{ inputs.vipm_lock }}') { $args['VipmLock'] = '${{ inputs.vipm_lock }}' }

$params = @{
ActionName = 'build-spec-github-hosted-windows'
Expand Down
Loading
Loading