From e97121f1faa2fcc5d20d77afd925933ec62b6ec2 Mon Sep 17 00:00:00 2001 From: John Mertic Date: Wed, 8 Jan 2025 12:36:24 -0500 Subject: [PATCH 1/5] Don't automerge if the job doesn't have access to the secrets (#900) Signed-off-by: John Mertic --- .github/workflows/validate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 1b0ef8bd..ad5ed3e1 100644 --- 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" From cbb162cb59fd547ee2d729a8d6ea46831fe9a50c Mon Sep 17 00:00:00 2001 From: Tom Slanda Date: Wed, 8 Jan 2025 12:42:36 -0500 Subject: [PATCH 2/5] updated workload automation 7 (#899) --- landscape.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/landscape.yml b/landscape.yml index 2bd253b4..6804cb85 100644 --- a/landscape.yml +++ b/landscape.yml @@ -714,7 +714,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 From d52ad6abddf76ef5c5b8aac503d76fdb23945ef7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 12:43:10 -0500 Subject: [PATCH 3/5] Bump the all group across 1 directory with 2 updates (#895) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/merge-schedule.yml | 2 +- .github/workflows/scorecards.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge-schedule.yml b/.github/workflows/merge-schedule.yml index 9c9842ba..094da6f8 100644 --- 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 index 411c5c59..9b74f37f 100644 --- 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 From be86b0d094b26a62b6d59e229e83cdb5c3673f5c Mon Sep 17 00:00:00 2001 From: John Mertic Date: Wed, 8 Jan 2025 13:09:39 -0500 Subject: [PATCH 4/5] =?UTF-8?q?Remove=20duplicate=20`JCLCheck=20Workload?= =?UTF-8?q?=20Automation`=20and=20move=20`IBM=C2=AE=20Z=20System=20Automat?= =?UTF-8?q?ion`=20out=20of=20under=20Support=20Conformance=20(#896)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Mertic --- landscape.yml | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/landscape.yml b/landscape.yml index 6804cb85..7afeec45 100644 --- 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: |- @@ -881,17 +892,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: @@ -925,8 +925,8 @@ landscape: - Zowe Conformant Support Provider / CLI ZOWE V2 - Zowe Conformant Support Provider / Explorer for Visual Studio Code ZOWE V2 description: >- - 24x7 Enterprise Support for Zowe, Code4z and Test4z from a trusted mainframe partner, enabling teams to adopt open source with confidence. - Brightside subscribers also have access to exclusive innovations. + 24x7 Enterprise Support for Zowe, Code4z and Test4z from a trusted mainframe partner, enabling teams to adopt open source with confidence. Brightside subscribers also + have access to exclusive innovations. homepage_url: https://integration.mainframe.broadcom.com/ logo: brightside.svg crunchbase: https://www.crunchbase.com/organization/broadcom @@ -954,19 +954,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: [] From 2d4829921fb5448acbd78e54b7b5dc00b020ba2e Mon Sep 17 00:00:00 2001 From: John Mertic Date: Thu, 9 Jan 2025 00:02:42 -0500 Subject: [PATCH 5/5] Update Landscape from LFX 2025-01-09 (#902) --- landscape.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/landscape.yml b/landscape.yml index 7afeec45..33090778 100644 --- a/landscape.yml +++ b/landscape.yml @@ -925,8 +925,8 @@ landscape: - Zowe Conformant Support Provider / CLI ZOWE V2 - Zowe Conformant Support Provider / Explorer for Visual Studio Code ZOWE V2 description: >- - 24x7 Enterprise Support for Zowe, Code4z and Test4z from a trusted mainframe partner, enabling teams to adopt open source with confidence. Brightside subscribers also - have access to exclusive innovations. + 24x7 Enterprise Support for Zowe, Code4z and Test4z from a trusted mainframe partner, enabling teams to adopt open source with confidence. + Brightside subscribers also have access to exclusive innovations. homepage_url: https://integration.mainframe.broadcom.com/ logo: brightside.svg crunchbase: https://www.crunchbase.com/organization/broadcom