Skip to content

Fix/date 20260814 #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nevstop merged 3 commits into from
Aug 14, 2026
Merged

Fix/date 20260814 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2583edb
fix 乱码问题
Aug 14, 2026
ee4d4f1
fix 乱码问题并新增获取仓库根目录脚本 #16
Aug 14, 2026
6c6314b
重构CI流程：合并VI检查与VIPM构建为单任务
Aug 14, 2026
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
19 changes: 3 additions & 16 deletions .github/workflows/labview-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ on:
workflow_dispatch:

jobs:
# Step 1: Check for broken VIs
Check_Broken_VIs:
# Check for broken VIs and build the VIPM library on the same runner.
Check_Broken_VIs_And_Build_VIPM_Library:
runs-on: [self-hosted, lv2017]
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -54,22 +54,9 @@ jobs:
exit 1
shell: powershell

# Step 2: Build VIPM library (only if broken VI check passes)
Build_VIPM_Library:
needs: Check_Broken_VIs
runs-on: [self-hosted, lv2017]
steps:
# Get env variables
# Get env variables required for the FTP backup path.
- uses: FranzDiebold/github-env-vars-action@v2

- uses: actions/checkout@v4

- name: vipm-InstallPackage
uses: NEVSTOP-LAB/vipm-InstallPackage@main
with:
LabVIEW_Version: 2017
Package: "Git API"

- name: BuildDailyVIP
id: build-vip
uses: LV-APT/lvCICD@main
Expand Down
63 changes: 62 additions & 1 deletion SimpleGit-Provider.lvproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,68 @@
</Item>
<Item Name="SimpleGit_Global_Interface.vi" Type="VI" URL="../SimpleGit/SimpleGit_Global_Interface.vi"/>
<Item Name="SimpleGit_Item_Interface.vi" Type="VI" URL="../SimpleGit/SimpleGit_Item_Interface.vi"/>
<Item Name="Dependencies" Type="Dependencies"/>
<Item Name="Dependencies" Type="Dependencies">
<Item Name="vi.lib" Type="Folder">
<Item Name="BuildHelpPath.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/BuildHelpPath.vi"/>
<Item Name="Check if File or Folder Exists.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/libraryn.llb/Check if File or Folder Exists.vi"/>
<Item Name="Check Special Tags.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Check Special Tags.vi"/>
<Item Name="Clear Errors.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Clear Errors.vi"/>
<Item Name="Convert property node font to graphics font.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Convert property node font to graphics font.vi"/>
<Item Name="Details Display Dialog.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Details Display Dialog.vi"/>
<Item Name="DialogType.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/DialogType.ctl"/>
<Item Name="DialogTypeEnum.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/DialogTypeEnum.ctl"/>
<Item Name="Error Cluster From Error Code.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Error Cluster From Error Code.vi"/>
<Item Name="Error Code Database.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Error Code Database.vi"/>
<Item Name="ErrWarn.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/ErrWarn.ctl"/>
<Item Name="eventvkey.ctl" Type="VI" URL="/&lt;vilib&gt;/event_ctls.llb/eventvkey.ctl"/>
<Item Name="Find Tag.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Find Tag.vi"/>
<Item Name="Format Message String.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Format Message String.vi"/>
<Item Name="General Error Handler Core CORE.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/General Error Handler Core CORE.vi"/>
<Item Name="General Error Handler.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/General Error Handler.vi"/>
<Item Name="Get String Text Bounds.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Get String Text Bounds.vi"/>
<Item Name="Get Text Rect.vi" Type="VI" URL="/&lt;vilib&gt;/picture/picture.llb/Get Text Rect.vi"/>
<Item Name="GetHelpDir.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/GetHelpDir.vi"/>
<Item Name="GetRTHostConnectedProp.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/GetRTHostConnectedProp.vi"/>
<Item Name="High Resolution Relative Seconds.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/High Resolution Relative Seconds.vi"/>
<Item Name="Longest Line Length in Pixels.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Longest Line Length in Pixels.vi"/>
<Item Name="LVBoundsTypeDef.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/miscctls.llb/LVBoundsTypeDef.ctl"/>
<Item Name="LVRectTypeDef.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/miscctls.llb/LVRectTypeDef.ctl"/>
<Item Name="NI_FileType.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/lvfile.llb/NI_FileType.lvlib"/>
<Item Name="NI_PackedLibraryUtility.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/LVLibp/NI_PackedLibraryUtility.lvlib"/>
<Item Name="Not Found Dialog.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Not Found Dialog.vi"/>
<Item Name="Search and Replace Pattern.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Search and Replace Pattern.vi"/>
<Item Name="Set Bold Text.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Set Bold Text.vi"/>
<Item Name="Set String Value.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Set String Value.vi"/>
<Item Name="Simple Error Handler.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Simple Error Handler.vi"/>
<Item Name="System Exec.vi" Type="VI" URL="/&lt;vilib&gt;/Platform/system.llb/System Exec.vi"/>
<Item Name="TagReturnType.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/TagReturnType.ctl"/>
<Item Name="Three Button Dialog CORE.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Three Button Dialog CORE.vi"/>
<Item Name="Three Button Dialog.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Three Button Dialog.vi"/>
<Item Name="Trim Whitespace.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Trim Whitespace.vi"/>
<Item Name="whitespace.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/whitespace.ctl"/>
</Item>
<Item Name="Global_Interface.ctl" Type="VI" URL="/&lt;resource&gt;/Framework/Providers/API/Global_Interface.ctl"/>
<Item Name="Item_Interface.ctl" Type="VI" URL="/&lt;resource&gt;/Framework/Providers/API/Item_Interface.ctl"/>
<Item Name="ItemRef.ctl" Type="VI" URL="/&lt;resource&gt;/Framework/Providers/API/ItemRef.ctl"/>
<Item Name="LV Config Read Boolean.vi" Type="VI" URL="/&lt;resource&gt;/dialog/lvconfig.llb/LV Config Read Boolean.vi"/>
<Item Name="LV Config Read Color.vi" Type="VI" URL="/&lt;resource&gt;/dialog/lvconfig.llb/LV Config Read Color.vi"/>
<Item Name="LV Config Read Numeric (I32).vi" Type="VI" URL="/&lt;resource&gt;/dialog/lvconfig.llb/LV Config Read Numeric (I32).vi"/>
<Item Name="LV Config Read Pathlist.vi" Type="VI" URL="/&lt;resource&gt;/dialog/lvconfig.llb/LV Config Read Pathlist.vi"/>
<Item Name="LV Config Read String.vi" Type="VI" URL="/&lt;resource&gt;/dialog/lvconfig.llb/LV Config Read String.vi"/>
<Item Name="LV Config Read.vi" Type="VI" URL="/&lt;resource&gt;/dialog/lvconfig.llb/LV Config Read.vi"/>
<Item Name="LV Config Write Boolean.vi" Type="VI" URL="/&lt;resource&gt;/dialog/lvconfig.llb/LV Config Write Boolean.vi"/>
<Item Name="LV Config Write Color.vi" Type="VI" URL="/&lt;resource&gt;/dialog/lvconfig.llb/LV Config Write Color.vi"/>
<Item Name="LV Config Write Numeric (I32).vi" Type="VI" URL="/&lt;resource&gt;/dialog/lvconfig.llb/LV Config Write Numeric (I32).vi"/>
<Item Name="LV Config Write Pathlist.vi" Type="VI" URL="/&lt;resource&gt;/dialog/lvconfig.llb/LV Config Write Pathlist.vi"/>
<Item Name="LV Config Write String.vi" Type="VI" URL="/&lt;resource&gt;/dialog/lvconfig.llb/LV Config Write String.vi"/>
<Item Name="LV Config Write.vi" Type="VI" URL="/&lt;resource&gt;/dialog/lvconfig.llb/LV Config Write.vi"/>
<Item Name="mxLvDebugDisplayCaller.vi" Type="VI" URL="/&lt;resource&gt;/Framework/Providers/API/mxLvDebugDisplayCaller.vi"/>
<Item Name="mxLvErrorHandler.vi" Type="VI" URL="/&lt;resource&gt;/Framework/Providers/API/mxLvErrorHandler.vi"/>
<Item Name="mxLvGetProjectRef.vi" Type="VI" URL="/&lt;resource&gt;/Framework/Providers/API/mxLvGetProjectRef.vi"/>
<Item Name="mxLvMenuItem.ctl" Type="VI" URL="/&lt;resource&gt;/Framework/Providers/API/mxLvMenuItem.ctl"/>
<Item Name="mxLvProvider.mxx" Type="Document" URL="/&lt;resource&gt;/Framework/Providers/mxLvProvider.mxx"/>
<Item Name="mxLvSetPopupMenu.vi" Type="VI" URL="/&lt;resource&gt;/Framework/Providers/API/mxLvSetPopupMenu.vi"/>
</Item>
<Item Name="Build Specifications" Type="Build"/>
</Item>
</Project>
Binary file modified SimpleGit/Git/Command/SimpleGit-Commit.vi
View file
Open in desktop
Binary file not shown.
Binary file modified SimpleGit/Git/Command/SimpleGit-Pull.vi
View file
Open in desktop
Binary file not shown.
Binary file modified SimpleGit/Git/Command/SimpleGit-Push.vi
View file
Open in desktop
Binary file not shown.
Binary file modified SimpleGit/Git/Command/SimpleGit-Status.vi
View file
Open in desktop
Binary file not shown.
Binary file modified SimpleGit/Git/Command/SimpleGit-SwitchToDailyBranch.vi
View file
Open in desktop
Binary file not shown.
Binary file modified SimpleGit/Git/SimpleGit_Item_OnCommand.vi
View file
Open in desktop
Binary file not shown.
Binary file modified SimpleGit/Git/SimpleGit_Item_OnPopupMenu.vi
View file
Open in desktop
Binary file not shown.
Binary file modified SimpleGit/Git/SimpleGit_Item_OnUpdateCommand.vi
View file
Open in desktop
Binary file not shown.
Binary file modified SimpleGit/Git/SimpleGit_Menu_Hierachy.vi
View file
Open in desktop
Binary file not shown.
Binary file modified SimpleGit/Git/SimpleGit_OnCommand(SingleObject).vi
View file
Open in desktop
Binary file not shown.
Binary file modified SimpleGit/Git/_Support/tortoisegit/Tortoisegit commit.vi
View file
Open in desktop
Binary file not shown.
Binary file modified SimpleGit/Git/_Support/tortoisegit/Tortoisegit pull.vi
View file
Open in desktop
Binary file not shown.
Binary file modified SimpleGit/Git/_Support/tortoisegit/Tortoisegit push.vi
View file
Open in desktop
Binary file not shown.
18 changes: 18 additions & 0 deletions SimpleGit/Git/_scripts/Get_repository_root.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
@echo off
REM ============================================================
REM Get_repository_root.cmd
REM Prints the Git repository root for a file in the repository.
REM
REM Usage:
REM Get_repository_root.cmd "D:\repo\path\to\file.vi"
REM (quote paths with spaces)
REM
REM Output : the repository root on success
REM Exit : 0 = success, 1 = missing argument / not a repository
REM ============================================================

if "%~1"=="" exit /b 1

git -C "%~dp1." rev-parse --show-toplevel 2>nul
if errorlevel 1 exit /b 1
exit /b 0
Binary file modified SimpleGit/Git/_scripts/Run cmd File.vi
View file
Open in desktop
Binary file not shown.
Loading