diff --git a/.github/workflows/labview-ci.yml b/.github/workflows/labview-ci.yml index 6712891..0ccc819 100644 --- a/.github/workflows/labview-ci.yml +++ b/.github/workflows/labview-ci.yml @@ -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 @@ -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 diff --git a/SimpleGit-Provider.lvproj b/SimpleGit-Provider.lvproj index b0e80da..41f7a08 100644 --- a/SimpleGit-Provider.lvproj +++ b/SimpleGit-Provider.lvproj @@ -61,7 +61,68 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SimpleGit/Git/Command/SimpleGit-Commit.vi b/SimpleGit/Git/Command/SimpleGit-Commit.vi index 6bb2d6d..014cf88 100644 Binary files a/SimpleGit/Git/Command/SimpleGit-Commit.vi and b/SimpleGit/Git/Command/SimpleGit-Commit.vi differ diff --git a/SimpleGit/Git/Command/SimpleGit-Pull.vi b/SimpleGit/Git/Command/SimpleGit-Pull.vi index b4424ed..dc85d0d 100644 Binary files a/SimpleGit/Git/Command/SimpleGit-Pull.vi and b/SimpleGit/Git/Command/SimpleGit-Pull.vi differ diff --git a/SimpleGit/Git/Command/SimpleGit-Push.vi b/SimpleGit/Git/Command/SimpleGit-Push.vi index 8e46be6..2819fe8 100644 Binary files a/SimpleGit/Git/Command/SimpleGit-Push.vi and b/SimpleGit/Git/Command/SimpleGit-Push.vi differ diff --git a/SimpleGit/Git/Command/SimpleGit-Status.vi b/SimpleGit/Git/Command/SimpleGit-Status.vi index ccb18a6..35ef4c3 100644 Binary files a/SimpleGit/Git/Command/SimpleGit-Status.vi and b/SimpleGit/Git/Command/SimpleGit-Status.vi differ diff --git a/SimpleGit/Git/Command/SimpleGit-SwitchToDailyBranch.vi b/SimpleGit/Git/Command/SimpleGit-SwitchToDailyBranch.vi index bf18e5d..67115fd 100644 Binary files a/SimpleGit/Git/Command/SimpleGit-SwitchToDailyBranch.vi and b/SimpleGit/Git/Command/SimpleGit-SwitchToDailyBranch.vi differ diff --git a/SimpleGit/Git/SimpleGit_Item_OnCommand.vi b/SimpleGit/Git/SimpleGit_Item_OnCommand.vi index 64a2449..78755f5 100644 Binary files a/SimpleGit/Git/SimpleGit_Item_OnCommand.vi and b/SimpleGit/Git/SimpleGit_Item_OnCommand.vi differ diff --git a/SimpleGit/Git/SimpleGit_Item_OnPopupMenu.vi b/SimpleGit/Git/SimpleGit_Item_OnPopupMenu.vi index f1a7d71..4678a5d 100644 Binary files a/SimpleGit/Git/SimpleGit_Item_OnPopupMenu.vi and b/SimpleGit/Git/SimpleGit_Item_OnPopupMenu.vi differ diff --git a/SimpleGit/Git/SimpleGit_Item_OnUpdateCommand.vi b/SimpleGit/Git/SimpleGit_Item_OnUpdateCommand.vi index 06fc643..fd1e0db 100644 Binary files a/SimpleGit/Git/SimpleGit_Item_OnUpdateCommand.vi and b/SimpleGit/Git/SimpleGit_Item_OnUpdateCommand.vi differ diff --git a/SimpleGit/Git/SimpleGit_Menu_Hierachy.vi b/SimpleGit/Git/SimpleGit_Menu_Hierachy.vi index 09f84ad..2b3bd4f 100644 Binary files a/SimpleGit/Git/SimpleGit_Menu_Hierachy.vi and b/SimpleGit/Git/SimpleGit_Menu_Hierachy.vi differ diff --git a/SimpleGit/Git/SimpleGit_OnCommand(SingleObject).vi b/SimpleGit/Git/SimpleGit_OnCommand(SingleObject).vi index 9bcff18..241f8d8 100644 Binary files a/SimpleGit/Git/SimpleGit_OnCommand(SingleObject).vi and b/SimpleGit/Git/SimpleGit_OnCommand(SingleObject).vi differ diff --git a/SimpleGit/Git/_Support/tortoisegit/Tortoisegit commit.vi b/SimpleGit/Git/_Support/tortoisegit/Tortoisegit commit.vi index a088844..70e5430 100644 Binary files a/SimpleGit/Git/_Support/tortoisegit/Tortoisegit commit.vi and b/SimpleGit/Git/_Support/tortoisegit/Tortoisegit commit.vi differ diff --git a/SimpleGit/Git/_Support/tortoisegit/Tortoisegit pull.vi b/SimpleGit/Git/_Support/tortoisegit/Tortoisegit pull.vi index a67c8bd..852015a 100644 Binary files a/SimpleGit/Git/_Support/tortoisegit/Tortoisegit pull.vi and b/SimpleGit/Git/_Support/tortoisegit/Tortoisegit pull.vi differ diff --git a/SimpleGit/Git/_Support/tortoisegit/Tortoisegit push.vi b/SimpleGit/Git/_Support/tortoisegit/Tortoisegit push.vi index a601db7..8ed59b4 100644 Binary files a/SimpleGit/Git/_Support/tortoisegit/Tortoisegit push.vi and b/SimpleGit/Git/_Support/tortoisegit/Tortoisegit push.vi differ diff --git a/SimpleGit/Git/_scripts/Get_repository_root.cmd b/SimpleGit/Git/_scripts/Get_repository_root.cmd new file mode 100644 index 0000000..6c625b9 --- /dev/null +++ b/SimpleGit/Git/_scripts/Get_repository_root.cmd @@ -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 diff --git a/SimpleGit/Git/_scripts/Run cmd File.vi b/SimpleGit/Git/_scripts/Run cmd File.vi index 47cfdf4..79ca6be 100644 Binary files a/SimpleGit/Git/_scripts/Run cmd File.vi and b/SimpleGit/Git/_scripts/Run cmd File.vi differ