diff --git a/.github/workflows/Build_VIPM_Library.yml b/.github/workflows/Build_VIPM_Library.yml deleted file mode 100644 index cba6d00..0000000 --- a/.github/workflows/Build_VIPM_Library.yml +++ /dev/null @@ -1,75 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: Build_VIPM_Library - -# Controls when the workflow will run -on: - # Triggers the workflow on push or pull request events but only for the main branch - pull_request: - branches: - - main - types: [closed] - - push: - paths-ignore: - - '**.md' - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "build" - Build_VIPM_Library: - # The type of runner that the job will run on - runs-on: [self-hosted, lv2014] - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - - # Get env variables - # https://github.com/marketplace/actions/github-environment-variables-action - - uses: FranzDiebold/github-env-vars-action@v2 - - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v3 - - # Runs a set of commands using the runners shell - - name: BuildDailyVIP - id: build-vip - uses: LV-APT/lvCICD@main - with: - LabVIEW_Version: 2014 - Operation: vipm_BuildDailyVIP - Parameter1: ${{ github.workspace }} - Parameter2: NO - - - id: vip-name - run: - $vipName=Split-Path -Path ${{ steps.build-vip.outputs.Result }} -Leaf; - Write-Host "::set-output name=vipName::"$vipName"" - shell: powershell - - - name: Upload a Build Artifact - uses: actions/upload-artifact@v4.3.2 - with: - # Artifact name - name: ${{ steps.vip-name.outputs.vipName }} - path: ${{ steps.build-vip.outputs.Result }} - # The desired behavior if no files are found using the provided path. - if-no-files-found: warn - retention-days: 90 - - # Backup generated files by ftp - # https://github.com/marketplace/actions/simple-ftp-upload - - name: backup Build Artifact by ftp - uses: dennisameling/ftp-upload-action@v1.0.9 - with: - server: ${{ secrets.VIPM_FTP_IP }} - port: ${{ secrets.VIPM_FTP_PORT }} - username: ${{ secrets.VIPM_FTP_USER }} - password: ${{ secrets.VIPM_FTP_PASSWORD }} - secure: false - server_dir: /${{ env.CI_REPOSITORY_OWNER_SLUG }}/${{ env.CI_REPOSITORY_NAME }}/${{ env.CI_ACTION_REF_NAME }}/ - local_dir: ./vip/ - diff --git a/.github/workflows/Check_Broken_VIs.yml b/.github/workflows/Check_Broken_VIs.yml deleted file mode 100644 index 094591a..0000000 --- a/.github/workflows/Check_Broken_VIs.yml +++ /dev/null @@ -1,36 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: Check_Broken_VIs - -# Controls when the workflow will run -on: - # Triggers the workflow on push or pull request events but only for the main branch - push: - paths-ignore: - - '**.md' - - '**.txt' - - '**.drawio' - - '**.vipb' - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "build" - Check_Broken_VIs: - # The type of runner that the job will run on - runs-on: [self-hosted, lv2014] - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v3 - - # Runs a set of commands using the runners shell - - id: Check_Broken_VIs - uses: LV-APT/lvCICD@main - with: - LabVIEW_Version: 2014 - Operation: VIAn_CheckBrokenVIs - Parameter1: ${{ github.workspace }} - Parameter2: NOPASSWORD - Parameter3: YES - Parameter4: -placeContent diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..670f0a7 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,76 @@ +name: CI + +on: + pull_request: + branches: + - main + + push: + branches: + - main + paths-ignore: + - '**.md' + - '**.txt' + - '**.drawio' + - '**.vipb' + + workflow_dispatch: + +jobs: + + # ────────────────────────────────────────────── + # Job 1: Check for broken VIs (quick gate) + # ────────────────────────────────────────────── + Check_Broken_VIs: + runs-on: [self-hosted, lv2017] + + steps: + - uses: actions/checkout@v4.2.2 + + - id: Check_Broken_VIs + uses: NEVSTOP-LAB/lvCICD@main + with: + LabVIEW_Version: 2017 + Operation: VIAn_CheckBrokenVIs + Parameter1: ${{ github.workspace }} + Parameter2: NOPASSWORD + Parameter3: YES + Parameter4: -placeContent + + # ────────────────────────────────────────────── + # Job 2: Build VIPM library (only if check passed) + # ────────────────────────────────────────────── + Build_VIPM_Library: + needs: Check_Broken_VIs + runs-on: [self-hosted, lv2017] + + steps: + - uses: FranzDiebold/github-env-vars-action@v2 + + - uses: actions/checkout@v4.2.2 + + - name: BuildDailyVIP + id: build-vip + uses: NEVSTOP-LAB/vipm-BuildViPackage@main + with: + LabVIEW_Version: 2017 + VipbPath: ${{ github.workspace }} + + - name: Upload a Build Artifact + uses: actions/upload-artifact@v4.3.2 + with: + name: ${{ steps.build-vip.outputs.vipName }} + path: ${{ steps.build-vip.outputs.vipPathName }} + if-no-files-found: warn + retention-days: 90 + + - name: backup Build Artifact by ftp + uses: dennisameling/ftp-upload-action@v1.0.9 + with: + server: ${{ secrets.VIPM_FTP_IP }} + port: ${{ secrets.VIPM_FTP_PORT }} + username: ${{ secrets.VIPM_FTP_USER }} + password: ${{ secrets.VIPM_FTP_PASSWORD }} + secure: false + server_dir: /${{ env.CI_REPOSITORY_OWNER_SLUG }}/${{ env.CI_REPOSITORY_NAME }}/${{ env.CI_ACTION_REF_NAME }}/ + local_dir: ./vip/ diff --git a/LabVIEW-QuickDrops-Manager.vipb b/LabVIEW-QuickDrops-Manager.vipb index 9583438..72af8ea 100644 --- a/LabVIEW-QuickDrops-Manager.vipb +++ b/LabVIEW-QuickDrops-Manager.vipb @@ -1,4 +1,4 @@ - + LabVIEW_QuickDrops_Manager 1.0.0.8 @@ -50,9 +50,11 @@ NEVSTOP https://github.com/NEVSTOP-LAB - [add] #22 Change String/Numeric Display Style - https://github.com/NEVSTOP-LAB/LabVIEW-QuickDrops-Manager/wiki/Control-Operation -[add] #29 add fit VI window to content - https://github.com/NEVSTOP-LAB/LabVIEW-QuickDrops-Manager/wiki/Fit-VI-Window-to-Content -[fix] fix conflicting files + [add] #22 Change string/numeric display style +[add] #29 Add fit-to-content for VI window +[add] #37 Add shortcut for converting String, Array, Ring, ComboBox to Enum @datadataup +[fix] Fix conflicting files +[fix] Remove dependency libraries @@ -250,6 +252,15 @@ DEV ENVIRONMENT LabVIEW 2017 + + README(zh-cn).md + + + src/user.lib/_NEVSTOP/_QuickDrop/library icon.jpg + + + src/user.lib/_NEVSTOP/_QuickDrop/_LabVIEW.ini + LICENSE diff --git a/src/resource/dialog/QuickDrop/plugins/QD_String to Enum/MutiType to Enum.vi b/src/resource/dialog/QuickDrop/plugins/QD_String to Enum/MutiType to Enum.vi index 4a7b92f..596ef6e 100644 Binary files a/src/resource/dialog/QuickDrop/plugins/QD_String to Enum/MutiType to Enum.vi and b/src/resource/dialog/QuickDrop/plugins/QD_String to Enum/MutiType to Enum.vi differ diff --git a/src/resource/plugins/PopupMenus/edit time panel and diagram/QD Manager.llb b/src/resource/plugins/PopupMenus/edit time panel and diagram/QD Manager.llb deleted file mode 100644 index a4a0092..0000000 Binary files a/src/resource/plugins/PopupMenus/edit time panel and diagram/QD Manager.llb and /dev/null differ diff --git a/src/resource/plugins/PopupMenus/edit time panel and diagram/Quick-Drop Manager.llb b/src/resource/plugins/PopupMenus/edit time panel and diagram/Quick-Drop Manager.llb new file mode 100644 index 0000000..0e8328f Binary files /dev/null and b/src/resource/plugins/PopupMenus/edit time panel and diagram/Quick-Drop Manager.llb differ