Merge branch 'main' into slandath-patch-2

openmainframeproject · Jan 9, 2025 · 8d659f7 · 8d659f7
2 parents d493185 + 2d48299
commit 8d659f7
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 28 deletions.
diff --git a/.github/workflows/merge-schedule.yml b/.github/workflows/merge-schedule.yml
@@ -18,7 +18,7 @@ jobs:
         with:
           egress-policy: audit
 
-      - uses: gr2m/merge-schedule-action@678b3399de95e30d1c7c48b319b3b86b533d2ab9 # v2.4.4
+      - uses: gr2m/merge-schedule-action@c516ecea9b265888ed9f7ba5f82b964dd678d80f # v2.5.0
         with:
           # Merge method to use. Possible values are merge, squash or
           # rebase. Default is merge.

diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -71,6 +71,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -18,7 +18,7 @@ jobs:
           target_kind: data
           target_path: ./landscape.yml
       - uses: pascalgn/automerge-action@v0.16.4
-        if: success()
+        if: success() && ${{ github.secret_source == 'Actions' }}
         env:
           GITHUB_TOKEN: "${{ secrets.PAT }}"
           MERGE_LABELS: "automated-build"

diff --git a/landscape.yml b/landscape.yml
@@ -384,6 +384,17 @@ landscape:
             logo: ibm-z-netview.svg
             twitter: https://twitter.com/ibmz
             crunchbase: https://www.crunchbase.com/organization/ibm
+          - item:
+            name: IBM® Z System Automation
+            second_path:
+              - Zowe Conformant / CLI ZOWE V2
+            description: >-
+              IBM® Z System Automation is a policy-based, self-healing, high-availability solution to optimize efficiency and availability of critical systems
+              and applications.
+            homepage_url: https://www.ibm.com/products/z-system-automation
+            logo: ibm-z-system-automation.svg
+            twitter: https://twitter.com/ibmz
+            crunchbase: https://www.crunchbase.com/organization/ibm
           - item:
             name: IDMS Systems REST API
             description: |-
@@ -721,7 +732,7 @@ landscape:
             logo: watchtower-metric-catalog.svg
             crunchbase: https://www.crunchbase.com/organization/broadcom
           - item:
-            name: Workload Automation 7®
+            name: Workload Automation CA7®
             second_path:
               - Zowe Conformant / API Mediation Layer ZOWE V2
               - Zowe Conformant / CLI ZOWE V2
@@ -888,17 +899,6 @@ landscape:
       - subcategory:
         name: API Mediation Layer ZOWE V2
         items:
-          - item:
-            name: IBM® Z System Automation
-            second_path:
-              - Zowe Conformant / CLI ZOWE V2
-            description: >-
-              IBM® Z System Automation is a policy-based, self-healing, high-availability solution to optimize efficiency and availability of critical systems
-              and applications.
-            homepage_url: https://www.ibm.com/products/z-system-automation
-            logo: ibm-z-system-automation.svg
-            twitter: https://twitter.com/ibmz
-            crunchbase: https://www.crunchbase.com/organization/ibm
           - item:
             name: Rocket Support for Zowe
             second_path:
@@ -961,19 +961,7 @@ landscape:
         items: []
       - subcategory:
         name: API Mediation Layer ZOWE V3
-        items:
-          - item:
-            name: JCLCheck Workload Automation
-            second_path:
-              - Zowe Conformant / API Mediation Layer ZOWE V2
-            description: >-
-              JCLCheck Workload Automation lets you validate the accuracy of Job Control Language (JCL) during development or automated processes.  Use the
-              plug-in to identify execution-time errors, such as security violations and missing data sets, that can cause jobs to fail and lead to delays in
-              production cycles.
-            homepage_url: https://integration.mainframe.broadcom.com
-            stock_ticker: AVGO
-            logo: jclcheck-workload-automation.svg
-            crunchbase: https://www.crunchbase.com/organization/broadcom
+        items: []
       - subcategory:
         name: App Framework ZOWE V3
         items: []