Merge pull request #1 from SkylineCommunicationsSandbox/create-pull-r…

…equest/patch Changes by create-pull-request action
SkylineCommunicationsSandbox · Jan 14, 2025 · d81a2d2 · d81a2d2
2 parents b5938b8 + f887755
commit d81a2d2
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 8 deletions.
diff --git a/workflow-templates/DataMiner-CICD-Connector-DeployOnly.properties.json b/workflow-templates/DataMiner-CICD-Connector-DeployOnly.properties.json
@@ -1,6 +1,6 @@
 {
     "name": "DataMiner CICD Connector Deploy Only",
-    "description": "[DO NOT USE - Work in Progress] Starter Workflow for CD only with a Skyline formatted Connector (aka protocol, driver) repository. Warning: avoid using this for stable releases. Use CI/CD for that.",
+    "description": "Starter Workflow for CD only with a Skyline formatted Connector (aka protocol, driver) repository. Warning: avoid using this for stable releases. Use CI/CD for that.",
     "filePatterns": [
         "protocol.xml",
         "QActions",

diff --git a/workflow-templates/DataMiner-CICD-Connector-DeployOnly.yml b/workflow-templates/DataMiner-CICD-Connector-DeployOnly.yml
@@ -25,17 +25,18 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install DataMiner Deploy
-        run: dotnet tool install -g Skyline.DataMiner.CICD.Tools.Packager
+        run: 
 
-      - name: Install DataMiner Deploy
-        run: dotnet tool install -g Skyline.DataMiner.CICD.Tools.DataMinerDeploy
+      - name: Install .NET Tools
+        run: |
+          dotnet tool install -g Skyline.DataMiner.CICD.Tools.Packager
+          dotnet tool install -g Skyline.DataMiner.CICD.Tools.DataMinerDeploy
       
 #ON RELEASE OR PRE-RELEASE
       - name: Create DMAPP - Release
         if: inputs.referenceType == 'tag'
         run: dataminer-package-create dmprotocol "${{ github.workspace }}" --name  "${{ github.repository  }}_${{ github.ref_name }}" --output "${{ github.workspace }}/_PackageResults" --version-override "${{ github.ref_name }}"
 
-
 #ON BUILD
       - name: Find and extract Protocol Version
         if: inputs.referenceType != 'tag'
@@ -60,7 +61,7 @@ jobs:
           dataminer-package-create dmprotocol "${{ github.workspace }}" --name  "${{ github.repository  }}_${{ github.run_number }}" --output "${{ github.workspace }}/_PackageResults" --version-override "${{ env.PROTOCOL_VERSION }}_B${{ github.run_number }}"
         shell: bash
 
-     # Deploys the artifact directly to an internet-accessible DataMiner Agent. Deployment from the catalog currently not supported.    
+     # Deploys the artifact directly to an internet-accessible DataMiner Agent.   
       - name: Find .dmprotocol
         id: findcreatedpackage        
         run: |

diff --git a/workflow-templates/DataMiner-CICD-Connector.properties.json b/workflow-templates/DataMiner-CICD-Connector.properties.json
@@ -1,6 +1,6 @@
 {
     "name": "DataMiner CICD Connector",
-    "description": "[DO NOT USE - Work in Progress] Starter Workflow for CICD with a Skyline formatted Connector (aka protocol, driver) repository.",
+    "description": "Starter Workflow for CICD with a Skyline formatted Connector (aka protocol, driver) repository.",
     "filePatterns": [
         "protocol.xml",
         "QActions",

diff --git a/workflow-templates/DataMiner-CICD-Connector.yml b/workflow-templates/DataMiner-CICD-Connector.yml
@@ -38,7 +38,7 @@ jobs:
   #   needs: CI
 
   #   steps:
-  #     - uses: actions/checkout@v3
+  #     - uses: actions/checkout@v4
 
   #     - name: Install DataMiner Deploy
   #       run: dotnet tool install -g Skyline.DataMiner.CICD.Tools.DataMinerDeploy

diff --git a/workflow-templates/DataMiner-CICD-UpdateCatalogDetails.properties.json b/workflow-templates/DataMiner-CICD-UpdateCatalogDetails.properties.json
@@ -0,0 +1,4 @@
+{
+    "name": "DataMiner CICD Update Catalog Details",
+    "description": "Starter Workflow for CICD to update the catalog details of a record."
+}
diff --git a/workflow-templates/DataMiner-CICD-UpdateCatalogDetails.yml b/workflow-templates/DataMiner-CICD-UpdateCatalogDetails.yml
@@ -0,0 +1,22 @@
+name: DataMiner CICD Update Catalog Details
+
+# Controls when the workflow will run
+on:
+  # push:
+  #   branches:
+  #     - main
+  #     - master
+
+  ## If you wish to only trigger on ReadMe changes. 
+  ## Consider: https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#onpushpull_requestpull_request_targetpathspaths-ignore
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+
+  Catalog:
+    uses: SkylineCommunications/_ReusableWorkflows/.github/workflows/Update Catalog Details Workflow.yml@main
+    secrets:
+      # The API-key: generated in the DCP Admin app (https://admin.dataminer.services/) as authentication for a certain DataMiner Organization or Agent.
+      api-key: ${{ secrets.DATAMINER_DEPLOY_KEY }}