From 3c3f0bbce6a86e04b6ef9ca115551dacde287718 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Wed, 7 May 2025 10:07:13 +0100 Subject: [PATCH 01/17] Bump development version to 0.42.0 Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- README.md | 2 +- build.properties | 2 +- modules/buildutils/pkg/cmd/root.go | 2 +- modules/cli/VERSION | 2 +- modules/cli/build.gradle | 4 +- .../generated/galasactl_runs_submit_local.md | 2 +- .../galasa-extensions-parent/build.gradle | 6 +- .../dev.galasa.ras.couchdb/build.gradle | 2 +- modules/extensions/release.yaml | 14 +- modules/framework/galasa-parent/build.gradle | 8 +- .../src/main/resources/openapi.yaml | 2 +- modules/framework/release.yaml | 62 ++++---- modules/gradle/README.md | 6 +- modules/gradle/build.gradle | 4 +- modules/ivts/README.md | 2 +- modules/ivts/galasa-ivts-parent/build.gradle | 2 +- .../galasa-ivts-parent/buildSrc/build.gradle | 2 +- .../galasa-managers-parent/build.gradle | 6 +- .../README.md | 2 +- modules/managers/release.yaml | 142 +++++++++--------- modules/maven/galasa-maven-plugin/pom.xml | 4 +- modules/obr/dependency-download/build.gradle | 2 +- modules/obr/release.yaml | 6 +- .../platform/dev.galasa.platform/build.gradle | 4 +- .../dev.galasa.wrapping.com.auth0.jwt/pom.xml | 4 +- .../pom.xml | 4 +- .../wrapping/dev.galasa.wrapping.gson/pom.xml | 4 +- .../pom.xml | 4 +- .../dev.galasa.wrapping.io.grpc.java/pom.xml | 4 +- .../pom.xml | 4 +- .../wrapping/dev.galasa.wrapping.jta/pom.xml | 4 +- .../dev.galasa.wrapping.kafka.clients/pom.xml | 4 +- .../dev.galasa.wrapping.protobuf-java/pom.xml | 4 +- .../pom.xml | 4 +- modules/wrapping/pom.xml | 4 +- 35 files changed, 167 insertions(+), 167 deletions(-) diff --git a/README.md b/README.md index 9862dc9393..e89780371e 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ The `set-version.sh` script allows you to set the version of the Galasa througho Use the `--help` flag to see what options are supported. -Basic usage: `set-version.sh --version 0.41.0` +Basic usage: `set-version.sh --version 0.42.0` ## Using vscode When using vscode to develop this code, we recommend the following settings are added to your `settings.json` file: diff --git a/build.properties b/build.properties index 024f0b7e91..6b802c8ea8 100644 --- a/build.properties +++ b/build.properties @@ -1,3 +1,3 @@ # This file is used to source the version of artifacts created by the github build workflows. # It gets maintained by the set-version.sh script, so don't change it manually without using that script. -GALASA_VERSION=0.41.0 \ No newline at end of file +GALASA_VERSION=0.42.0 \ No newline at end of file diff --git a/modules/buildutils/pkg/cmd/root.go b/modules/buildutils/pkg/cmd/root.go index 5e8c52e287..8fb99d6086 100644 --- a/modules/buildutils/pkg/cmd/root.go +++ b/modules/buildutils/pkg/cmd/root.go @@ -17,7 +17,7 @@ var rootCmd = &cobra.Command{ Use: "galasabld", Short: "Build utilities for Galasa", Long: "", - Version: "0.41.0", + Version: "0.42.0", } func Execute() { diff --git a/modules/cli/VERSION b/modules/cli/VERSION index 72a8a6313b..787ffc30a8 100644 --- a/modules/cli/VERSION +++ b/modules/cli/VERSION @@ -1 +1 @@ -0.41.0 +0.42.0 diff --git a/modules/cli/build.gradle b/modules/cli/build.gradle index 3fe04f1a98..2d5d4bc0f9 100644 --- a/modules/cli/build.gradle +++ b/modules/cli/build.gradle @@ -15,7 +15,7 @@ // dealing with. Do not mess with the `def {variableName}` part of the following // lines, only change the versions we rely upon. -def galasaVersion = '0.41.0' +def galasaVersion = '0.42.0' repositories { gradlePluginPortal() @@ -28,7 +28,7 @@ repositories { apply plugin: 'java' dependencies { // Use dev.galasa.platform to obtain the versions - implementation platform('dev.galasa:dev.galasa.platform:0.41.0') + implementation platform('dev.galasa:dev.galasa.platform:0.42.0') // We need the galasa-boot jar so we can launch tests in a local JVM implementation 'dev.galasa:galasa-boot' // We need the openapi generator to turn a yaml file into go client stubs, diff --git a/modules/cli/docs/generated/galasactl_runs_submit_local.md b/modules/cli/docs/generated/galasactl_runs_submit_local.md index 8b7646426f..16ece4df1a 100644 --- a/modules/cli/docs/generated/galasactl_runs_submit_local.md +++ b/modules/cli/docs/generated/galasactl_runs_submit_local.md @@ -17,7 +17,7 @@ galasactl runs submit local [flags] --debug When set (or true) the debugger pauses on startup and tries to connect to a Java debugger. The connection is established using the --debugMode and --debugPort values. --debugMode string The mode to use when the --debug option causes the testcase to connect to a Java debugger. Valid values are 'listen' or 'attach'. 'listen' means the testcase JVM will pause on startup, waiting for the Java debugger to connect to the debug port (see the --debugPort option). 'attach' means the testcase JVM will pause on startup, trying to attach to a java debugger which is listening on the debug port. The default value is 'listen' but can be overridden by the 'galasactl.jvm.local.launch.debug.mode' property in the bootstrap file, which in turn can be overridden by this explicit parameter on the galasactl command. --debugPort uint32 The port to use when the --debug option causes the testcase to connect to a java debugger. The default value used is 2970 which can be overridden by the 'galasactl.jvm.local.launch.debug.port' property in the bootstrap file, which in turn can be overridden by this explicit parameter on the galasactl command. - --galasaVersion string the version of galasa you want to use to run your tests. This should match the version of the galasa obr you built your test bundles against. (default "0.41.0") + --galasaVersion string the version of galasa you want to use to run your tests. This should match the version of the galasa obr you built your test bundles against. (default "0.42.0") --gherkin strings Gherkin feature file URL. Should start with 'file://'. -h, --help Displays the options for the 'runs submit local' command. --localMaven string The url of a local maven repository are where galasa bundles can be loaded from on your local file system. Defaults to your home .m2/repository file. Please note that this should be in a URL form e.g. 'file:///Users/myuserid/.m2/repository', or 'file://C:/Users/myuserid/.m2/repository' diff --git a/modules/extensions/galasa-extensions-parent/build.gradle b/modules/extensions/galasa-extensions-parent/build.gradle index 4c7fe5010b..2963801d34 100644 --- a/modules/extensions/galasa-extensions-parent/build.gradle +++ b/modules/extensions/galasa-extensions-parent/build.gradle @@ -1,13 +1,13 @@ plugins { id 'biz.aQute.bnd.builder' version '5.3.0' apply false - id 'dev.galasa.githash' version '0.41.0' apply false + id 'dev.galasa.githash' version '0.42.0' apply false id 'maven-publish' id 'signing' } allprojects { group = 'dev.galasa' - version = '0.41.0' + version = '0.42.0' } //--------------------------------------------------------------- @@ -170,7 +170,7 @@ publishing { name = "Manifest for extensions bundle versions" artifactId = "dev.galasa.extensions.manifest" groupId = 'dev.galasa' - version = '0.41.0' + version = '0.42.0' description = "Conveys bundle version information to OBR builds." licenses { license { diff --git a/modules/extensions/galasa-extensions-parent/dev.galasa.ras.couchdb/build.gradle b/modules/extensions/galasa-extensions-parent/dev.galasa.ras.couchdb/build.gradle index 07f69a6462..b08013fa11 100644 --- a/modules/extensions/galasa-extensions-parent/dev.galasa.ras.couchdb/build.gradle +++ b/modules/extensions/galasa-extensions-parent/dev.galasa.ras.couchdb/build.gradle @@ -5,7 +5,7 @@ plugins { description = 'Galasa RAS - CouchDB' -version = '0.41.0' +version = '0.42.0' configurations { implementation.transitive = false diff --git a/modules/extensions/release.yaml b/modules/extensions/release.yaml index a8f429de27..5d53b39cb0 100644 --- a/modules/extensions/release.yaml +++ b/modules/extensions/release.yaml @@ -23,7 +23,7 @@ framework: - artifact: dev.galasa.auth.couchdb - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -32,7 +32,7 @@ framework: codecoverage: true - artifact: dev.galasa.cps.etcd - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -41,7 +41,7 @@ framework: codecoverage: true - artifact: dev.galasa.cps.rest - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -50,7 +50,7 @@ framework: codecoverage: true - artifact: dev.galasa.events.kafka - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -59,7 +59,7 @@ framework: codecoverage: true - artifact: dev.galasa.extensions.common - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -68,7 +68,7 @@ framework: codecoverage: true - artifact: dev.galasa.extensions.common.couchdb - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -77,7 +77,7 @@ framework: codecoverage: true - artifact: dev.galasa.ras.couchdb - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false diff --git a/modules/framework/galasa-parent/build.gradle b/modules/framework/galasa-parent/build.gradle index c33f1e51f2..8913360a5e 100644 --- a/modules/framework/galasa-parent/build.gradle +++ b/modules/framework/galasa-parent/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id 'biz.aQute.bnd.builder' version '5.3.0' apply false - id 'dev.galasa.githash' version '0.41.0' apply false + id 'dev.galasa.githash' version '0.42.0' apply false id 'jacoco' id 'maven-publish' id 'signing' @@ -9,11 +9,11 @@ plugins { // Note: The following line is changed by the set-version.sh script. // It is also read by other build scrips as required. -version = "0.41.0" +version = "0.42.0" allprojects { group = 'dev.galasa' - version = "0.41.0" + version = "0.42.0" } signing { @@ -310,7 +310,7 @@ publishing { name = "Manifest for framework bundle versions" artifactId = "dev.galasa.framework.manifest" groupId = 'dev.galasa' - version = "0.41.0" + version = "0.42.0" description = "Conveys bundle version information to OBR builds." licenses { license { diff --git a/modules/framework/galasa-parent/dev.galasa.framework.api.openapi/src/main/resources/openapi.yaml b/modules/framework/galasa-parent/dev.galasa.framework.api.openapi/src/main/resources/openapi.yaml index 5c066a1fc9..c9fbeff497 100644 --- a/modules/framework/galasa-parent/dev.galasa.framework.api.openapi/src/main/resources/openapi.yaml +++ b/modules/framework/galasa-parent/dev.galasa.framework.api.openapi/src/main/resources/openapi.yaml @@ -6,7 +6,7 @@ openapi: 3.0.3 info: title: Galasa Ecosystem API - version : "0.41.0" + version : "0.42.0" description: The Galasa Ecosystem REST API allows you to interact with a Galasa Ecosystem. contact: url: https://galasa.dev/support diff --git a/modules/framework/release.yaml b/modules/framework/release.yaml index 0ccd1796cc..42be45523a 100644 --- a/modules/framework/release.yaml +++ b/modules/framework/release.yaml @@ -23,7 +23,7 @@ framework: bundles: - artifact: dev.galasa - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -32,7 +32,7 @@ framework: codecoverage: true - artifact: dev.galasa.framework - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -41,7 +41,7 @@ framework: codecoverage: true - artifact: dev.galasa.framework.auth.spi - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -50,7 +50,7 @@ framework: codecoverage: true - artifact: dev.galasa.framework.docker.controller - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -59,7 +59,7 @@ framework: codecoverage: true - artifact: dev.galasa.framework.k8s.controller - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -68,7 +68,7 @@ framework: codecoverage: true - artifact: dev.galasa.framework.log4j2.bridge - version: 0.41.0 + version: 0.42.0 obr: false mvp: false bom: false @@ -77,7 +77,7 @@ framework: codecoverage: false - artifact: dev.galasa.framework.maven.repository - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: false @@ -86,7 +86,7 @@ framework: codecoverage: true - artifact: dev.galasa.framework.maven.repository.spi - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: false @@ -95,7 +95,7 @@ framework: codecoverage: true - artifact: dev.galasa.framework.metrics - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -104,7 +104,7 @@ framework: codecoverage: true - artifact: dev.galasa.framework.resource.management - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -113,7 +113,7 @@ framework: codecoverage: true - artifact: galasa-boot - version: 0.41.0 + version: 0.42.0 obr: false mvp: true bom: false @@ -122,7 +122,7 @@ framework: codecoverage: true - artifact: galasa-testharness - version: 0.41.0 + version: 0.42.0 obr: false mvp: false bom: false @@ -135,7 +135,7 @@ api: bundles: - artifact: dev.galasa.framework.api - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -144,7 +144,7 @@ api: codecoverage: true - artifact: dev.galasa.framework.api.authentication - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -153,7 +153,7 @@ api: codecoverage: true - artifact: dev.galasa.framework.api.beans - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: true @@ -162,7 +162,7 @@ api: codecoverage: true - artifact: dev.galasa.framework.api.bootstrap - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -171,7 +171,7 @@ api: codecoverage: true - artifact: dev.galasa.framework.api.common - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -180,7 +180,7 @@ api: codecoverage: true - artifact: dev.galasa.framework.api.cps - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -189,7 +189,7 @@ api: codecoverage: true - artifact: dev.galasa.framework.api.health - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -198,7 +198,7 @@ api: codecoverage: true - artifact: dev.galasa.framework.api.launcher - version: 0.41.0 + version: 0.42.0 obr: false mvp: false bom: false @@ -207,7 +207,7 @@ api: codecoverage: false - artifact: dev.galasa.framework.api.monitors - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -216,7 +216,7 @@ api: codecoverage: true - artifact: dev.galasa.framework.api.openapi - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: true @@ -225,7 +225,7 @@ api: codecoverage: false - artifact: dev.galasa.framework.api.openapi.servlet - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -234,7 +234,7 @@ api: codecoverage: true - artifact: dev.galasa.framework.api.ras - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -243,7 +243,7 @@ api: codecoverage: true - artifact: dev.galasa.framework.api.rbac - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -252,7 +252,7 @@ api: codecoverage: true - artifact: dev.galasa.framework.api.resources - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -261,7 +261,7 @@ api: codecoverage: true - artifact: dev.galasa.framework.api.runs - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -270,7 +270,7 @@ api: codecoverage: true - artifact: dev.galasa.framework.api.secrets - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -279,7 +279,7 @@ api: codecoverage: true - artifact: dev.galasa.framework.api.streams - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -288,7 +288,7 @@ api: codecoverage: true - artifact: dev.galasa.framework.api.testcatalog - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -297,7 +297,7 @@ api: codecoverage: true - artifact: dev.galasa.framework.api.users - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false diff --git a/modules/gradle/README.md b/modules/gradle/README.md index 8dca1c93e6..7ccc46c771 100644 --- a/modules/gradle/README.md +++ b/modules/gradle/README.md @@ -13,7 +13,7 @@ To use the Gradle OBR plugin in a Gradle test project: ... id 'java' id 'maven-publish' - id 'dev.galasa.tests' version '0.41.0' + id 'dev.galasa.tests' version '0.42.0' ... } ``` @@ -26,8 +26,8 @@ To use the Gradle OBR plugin in a Gradle test project: ```groovy plugins { ... - id 'dev.galasa.obr' version '0.41.0' - id 'dev.galasa.testcatalog' version '0.41.0' + id 'dev.galasa.obr' version '0.42.0' + id 'dev.galasa.testcatalog' version '0.42.0' ... } diff --git a/modules/gradle/build.gradle b/modules/gradle/build.gradle index 54246c5f2d..fe1f01473f 100644 --- a/modules/gradle/build.gradle +++ b/modules/gradle/build.gradle @@ -9,11 +9,11 @@ group = "dev.galasa" // Note: The following line is changed by the set-version.sh script. // It is also read by other build scrips as required. -version = "0.41.0" +version = "0.42.0" allprojects { group = 'dev.galasa' - version = "0.41.0" + version = "0.42.0" } signing { diff --git a/modules/ivts/README.md b/modules/ivts/README.md index 2f9e2de94c..da5379306a 100644 --- a/modules/ivts/README.md +++ b/modules/ivts/README.md @@ -47,7 +47,7 @@ To find out how to initialise your local environment, see [Initialising your loc As an example, to run the `CoreManagerIVT` locally, run the following command: ``` galasactl runs submit local \ ---obr mvn:dev.galasa/dev.galasa.ivts.obr/0.41.0/obr \ +--obr mvn:dev.galasa/dev.galasa.ivts.obr/0.42.0/obr \ --class dev.galasa.ivts/dev.galasa.ivts.core.CoreManagerIVT \ --log - ``` diff --git a/modules/ivts/galasa-ivts-parent/build.gradle b/modules/ivts/galasa-ivts-parent/build.gradle index 3281b4a9f7..a5ce44bd06 100644 --- a/modules/ivts/galasa-ivts-parent/build.gradle +++ b/modules/ivts/galasa-ivts-parent/build.gradle @@ -1,4 +1,4 @@ allprojects { group = 'dev.galasa' - version = '0.41.0' + version = '0.42.0' } \ No newline at end of file diff --git a/modules/ivts/galasa-ivts-parent/buildSrc/build.gradle b/modules/ivts/galasa-ivts-parent/buildSrc/build.gradle index cc30666695..26b2beb304 100644 --- a/modules/ivts/galasa-ivts-parent/buildSrc/build.gradle +++ b/modules/ivts/galasa-ivts-parent/buildSrc/build.gradle @@ -2,7 +2,7 @@ plugins { id 'groovy-gradle-plugin' } -version = '0.41.0' +version = '0.42.0' // Allow external plugins to be resolved in the dependencies section // and used without specifying versions diff --git a/modules/managers/galasa-managers-parent/build.gradle b/modules/managers/galasa-managers-parent/build.gradle index f442e17eb3..764bec1c78 100644 --- a/modules/managers/galasa-managers-parent/build.gradle +++ b/modules/managers/galasa-managers-parent/build.gradle @@ -9,11 +9,11 @@ plugins { // It is used as the version number of the managers bundle, which contains a yaml // file which is in a release.yaml, but published to maven, so that the OBR build // can pick it up later. -version = "0.41.0" +version = "0.42.0" allprojects { group = 'dev.galasa' - version = "0.41.0" + version = "0.42.0" } // A configuration to publish the merge exec into @@ -229,7 +229,7 @@ publishing { name = "Manifest for managers bundle versions" artifactId = "dev.galasa.managers.manifest" groupId = 'dev.galasa' - version = "0.41.0" + version = "0.42.0" description = "Conveys bundle version information to OBR builds." licenses { license { diff --git a/modules/managers/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/README.md b/modules/managers/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/README.md index ba3e156dc9..95f824bc3f 100644 --- a/modules/managers/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/README.md +++ b/modules/managers/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/README.md @@ -18,5 +18,5 @@ To run the IVT locally: 4. Run the IVT: ``` - galasactl runs submit local --obr mvn:dev.galasa/dev.galasa.uber.obr/0.41.0/obr --class dev.galasa.kubernetes.manager.ivt/dev.galasa.kubernetes.manager.ivt.KubernetesManagerIVT --log - + galasactl runs submit local --obr mvn:dev.galasa/dev.galasa.uber.obr/0.42.0/obr --class dev.galasa.kubernetes.manager.ivt/dev.galasa.kubernetes.manager.ivt.KubernetesManagerIVT --log - ``` diff --git a/modules/managers/release.yaml b/modules/managers/release.yaml index c523d9f29f..70d1fad8b9 100644 --- a/modules/managers/release.yaml +++ b/modules/managers/release.yaml @@ -25,7 +25,7 @@ managers: - artifact: dev.galasa.cicsts.ceci.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -34,7 +34,7 @@ managers: codecoverage: true - artifact: dev.galasa.cicsts.ceci.manager.ivt - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: false @@ -43,7 +43,7 @@ managers: codecoverage: false - artifact: dev.galasa.cicsts.ceda.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -52,7 +52,7 @@ managers: codecoverage: true - artifact: dev.galasa.cicsts.ceda.manager.ivt - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: false @@ -61,7 +61,7 @@ managers: codecoverage: false - artifact: dev.galasa.cicsts.cemt.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -70,7 +70,7 @@ managers: codecoverage: true - artifact: dev.galasa.cicsts.cemt.manager.ivt - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: false @@ -79,7 +79,7 @@ managers: codecoverage: false - artifact: dev.galasa.cicsts.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -88,7 +88,7 @@ managers: codecoverage: true - artifact: dev.galasa.cicsts.manager.ivt - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: false @@ -97,7 +97,7 @@ managers: codecoverage: false - artifact: dev.galasa.cicsts.resource.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -106,7 +106,7 @@ managers: codecoverage: true - artifact: dev.galasa.cloud.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -115,7 +115,7 @@ managers: codecoverage: true - artifact: dev.galasa.docker.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -124,7 +124,7 @@ managers: codecoverage: true - artifact: dev.galasa.docker.manager.ivt - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -133,7 +133,7 @@ managers: codecoverage: false - artifact: dev.galasa.kubernetes.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -142,7 +142,7 @@ managers: codecoverage: true - artifact: dev.galasa.kubernetes.manager.ivt - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -151,7 +151,7 @@ managers: codecoverage: false - artifact: dev.galasa.liberty.manager - version: 0.41.0 + version: 0.42.0 obr: false mvp: false bom: false @@ -160,7 +160,7 @@ managers: codecoverage: false - artifact: dev.galasa.openstack.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: true @@ -169,7 +169,7 @@ managers: codecoverage: true - artifact: dev.galasa.common - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -178,7 +178,7 @@ managers: codecoverage: false - artifact: dev.galasa.http.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -187,7 +187,7 @@ managers: codecoverage: true - artifact: dev.galasa.http.manager.ivt - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: false @@ -196,7 +196,7 @@ managers: codecoverage: false - artifact: dev.galasa.ipnetwork.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -205,7 +205,7 @@ managers: codecoverage: true - artifact: dev.galasa.mq.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: true @@ -214,7 +214,7 @@ managers: codecoverage: true - artifact: dev.galasa.mq.manager.ivt - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -223,7 +223,7 @@ managers: codecoverage: false - artifact: dev.galasa.artifact.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -232,7 +232,7 @@ managers: codecoverage: true - artifact: dev.galasa.artifact.manager.ivt - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: false @@ -241,7 +241,7 @@ managers: codecoverage: false - artifact: dev.galasa.core.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -250,7 +250,7 @@ managers: codecoverage: true - artifact: dev.galasa.core.manager.ivt - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: false @@ -259,7 +259,7 @@ managers: codecoverage: false - artifact: dev.galasa.textscan.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -268,7 +268,7 @@ managers: codecoverage: true - artifact: dev.galasa.db2.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -277,7 +277,7 @@ managers: codecoverage: false - artifact: dev.galasa.db2.manager.ivt - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -286,7 +286,7 @@ managers: codecoverage: false - artifact: dev.galasa.eclipseruntime.manager - version: 0.41.0 + version: 0.42.0 obr: false mvp: false bom: false @@ -295,7 +295,7 @@ managers: codecoverage: false - artifact: dev.galasa.eclipseruntime.ubuntu.manager - version: 0.41.0 + version: 0.42.0 obr: false mvp: false bom: false @@ -304,7 +304,7 @@ managers: codecoverage: false - artifact: dev.galasa.imstm.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -313,7 +313,7 @@ managers: codecoverage: true - artifact: dev.galasa.imstm.manager.ivt - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: false @@ -322,7 +322,7 @@ managers: codecoverage: false - artifact: dev.galasa.java.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: true @@ -331,7 +331,7 @@ managers: codecoverage: true - artifact: dev.galasa.java.ubuntu.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: true @@ -340,7 +340,7 @@ managers: codecoverage: true - artifact: dev.galasa.java.windows.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: true @@ -349,7 +349,7 @@ managers: codecoverage: true - artifact: dev.galasa.elasticlog.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: true @@ -358,7 +358,7 @@ managers: codecoverage: true - artifact: dev.galasa.elasticlog.manager.ivt - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -367,7 +367,7 @@ managers: codecoverage: false - artifact: dev.galasa.phoenix2.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: true @@ -376,7 +376,7 @@ managers: codecoverage: false - artifact: dev.galasa.galasaecosystem.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: true @@ -385,7 +385,7 @@ managers: codecoverage: true - artifact: dev.galasa.galasaecosystem.manager.ivt - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -394,7 +394,7 @@ managers: codecoverage: false - artifact: dev.galasa.jmeter.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: true @@ -403,7 +403,7 @@ managers: codecoverage: false - artifact: dev.galasa.jmeter.manager.ivt - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -412,7 +412,7 @@ managers: codecoverage: false - artifact: dev.galasa.sdv.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -421,7 +421,7 @@ managers: codecoverage: true - artifact: dev.galasa.sdv.manager.ivt - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: false @@ -430,7 +430,7 @@ managers: codecoverage: false - artifact: dev.galasa.selenium.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -439,7 +439,7 @@ managers: codecoverage: true - artifact: dev.galasa.selenium.manager.ivt - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -448,7 +448,7 @@ managers: codecoverage: false - artifact: dev.galasa.vtp.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: true @@ -457,7 +457,7 @@ managers: codecoverage: false - artifact: dev.galasa.vtp.manager.ivt - version: 0.41.0 + version: 0.42.0 obr: false mvp: false bom: false @@ -466,7 +466,7 @@ managers: codecoverage: false - artifact: dev.galasa.linux.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: true @@ -475,7 +475,7 @@ managers: codecoverage: true - artifact: dev.galasa.linux.manager.ivt - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: false @@ -484,7 +484,7 @@ managers: codecoverage: false - artifact: dev.galasa.windows.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: true @@ -493,7 +493,7 @@ managers: codecoverage: false - artifact: dev.galasa.githubissue.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -502,7 +502,7 @@ managers: codecoverage: false - artifact: dev.galasa.zos.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -511,7 +511,7 @@ managers: codecoverage: true - artifact: dev.galasa.zos.manager.ivt - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: false @@ -520,7 +520,7 @@ managers: codecoverage: false - artifact: dev.galasa.zos3270.common - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -529,7 +529,7 @@ managers: codecoverage: false - artifact: dev.galasa.zos3270.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -538,7 +538,7 @@ managers: codecoverage: true - artifact: dev.galasa.zos3270.manager.ivt - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: false @@ -547,7 +547,7 @@ managers: codecoverage: false - artifact: dev.galasa.zosbatch.rseapi.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -556,7 +556,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosbatch.zosmf.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -565,7 +565,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosconsole.oeconsol.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -574,7 +574,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosconsole.zosmf.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -583,7 +583,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosfile.rseapi.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -592,7 +592,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosfile.zosmf.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -601,7 +601,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosliberty.angel.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: false bom: true @@ -610,7 +610,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosliberty.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -619,7 +619,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosmf.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -628,7 +628,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosprogram.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -637,7 +637,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosrseapi.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -646,7 +646,7 @@ managers: codecoverage: true - artifact: dev.galasa.zostsocommand.ssh.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true @@ -655,7 +655,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosunixcommand.ssh.manager - version: 0.41.0 + version: 0.42.0 obr: true mvp: true bom: true diff --git a/modules/maven/galasa-maven-plugin/pom.xml b/modules/maven/galasa-maven-plugin/pom.xml index 5ccf2c0f72..79422deb6b 100644 --- a/modules/maven/galasa-maven-plugin/pom.xml +++ b/modules/maven/galasa-maven-plugin/pom.xml @@ -7,7 +7,7 @@ dev.galasa galasa-maven-plugin maven-plugin - 0.41.0 + 0.42.0 Galasa Maven Plugin Maven plugin for build Galasa artifacts such as the OBR, Test Catalog @@ -62,7 +62,7 @@ dev.galasa dev.galasa.platform - 0.41.0 + 0.42.0 pom import diff --git a/modules/obr/dependency-download/build.gradle b/modules/obr/dependency-download/build.gradle index ae76650d03..9b7ea83c26 100644 --- a/modules/obr/dependency-download/build.gradle +++ b/modules/obr/dependency-download/build.gradle @@ -7,7 +7,7 @@ plugins { // It is used as the version number of the managers bundle, which contains a yaml // file which is in a release.yaml, but published to maven, so that the OBR build // can pick it up later. -version = "0.41.0" +version = "0.42.0" repositories { mavenLocal() diff --git a/modules/obr/release.yaml b/modules/obr/release.yaml index c24e81799b..cf88f28c88 100644 --- a/modules/obr/release.yaml +++ b/modules/obr/release.yaml @@ -12,7 +12,7 @@ metadata: release: - version: 0.41.0 + version: 0.42.0 # Dependencies with bom: true need their versions stated explicitly # As the galasa-bom is a component consumed by users, its too risky @@ -102,14 +102,14 @@ external: - group: dev.galasa artifact: dev.galasa.wrapping.gson - version: 0.41.0 + version: 0.42.0 obr: true bom: true mvp: true isolated: true - artifact: dev.galasa.wrapping.httpclient-osgi - version: 0.41.0 + version: 0.42.0 obr: true bom: true mvp: true diff --git a/modules/platform/dev.galasa.platform/build.gradle b/modules/platform/dev.galasa.platform/build.gradle index 662e1cfadd..833824407d 100644 --- a/modules/platform/dev.galasa.platform/build.gradle +++ b/modules/platform/dev.galasa.platform/build.gradle @@ -4,7 +4,7 @@ plugins { id 'signing' } -version = "0.41.0" +version = "0.42.0" javaPlatform { allowDependencies() @@ -328,7 +328,7 @@ publishing { name = 'Gradle Java Platform for Galasa bundles' groupId = 'dev.galasa' artifactId = 'dev.galasa.platform' - version = "0.41.0" + version = "0.42.0" description = 'Provides versions to dependencies' licenses { license { diff --git a/modules/wrapping/dev.galasa.wrapping.com.auth0.jwt/pom.xml b/modules/wrapping/dev.galasa.wrapping.com.auth0.jwt/pom.xml index ec84813db7..45fcb1b078 100644 --- a/modules/wrapping/dev.galasa.wrapping.com.auth0.jwt/pom.xml +++ b/modules/wrapping/dev.galasa.wrapping.com.auth0.jwt/pom.xml @@ -6,11 +6,11 @@ dev.galasa dev.galasa.wrapping.parent - 0.41.0 + 0.42.0 dev.galasa.wrapping.com.auth0.jwt - 0.41.0 + 0.42.0 bundle Galasa wrapped version of auth0 JWT diff --git a/modules/wrapping/dev.galasa.wrapping.com.jcraft.jsch/pom.xml b/modules/wrapping/dev.galasa.wrapping.com.jcraft.jsch/pom.xml index 6a5bb29a48..86e8e20ed5 100644 --- a/modules/wrapping/dev.galasa.wrapping.com.jcraft.jsch/pom.xml +++ b/modules/wrapping/dev.galasa.wrapping.com.jcraft.jsch/pom.xml @@ -6,11 +6,11 @@ dev.galasa dev.galasa.wrapping.parent - 0.41.0 + 0.42.0 dev.galasa.wrapping.com.jcraft.jsch - 0.41.0 + 0.42.0 bundle galasa wrapped version of JSCH diff --git a/modules/wrapping/dev.galasa.wrapping.gson/pom.xml b/modules/wrapping/dev.galasa.wrapping.gson/pom.xml index 3a2abb86e4..7e07591dae 100644 --- a/modules/wrapping/dev.galasa.wrapping.gson/pom.xml +++ b/modules/wrapping/dev.galasa.wrapping.gson/pom.xml @@ -6,11 +6,11 @@ dev.galasa dev.galasa.wrapping.parent - 0.41.0 + 0.42.0 dev.galasa.wrapping.gson - 0.41.0 + 0.42.0 bundle Galasa wrapped version of GSON diff --git a/modules/wrapping/dev.galasa.wrapping.httpclient-osgi/pom.xml b/modules/wrapping/dev.galasa.wrapping.httpclient-osgi/pom.xml index 67052ef17e..d3c578a4b5 100644 --- a/modules/wrapping/dev.galasa.wrapping.httpclient-osgi/pom.xml +++ b/modules/wrapping/dev.galasa.wrapping.httpclient-osgi/pom.xml @@ -6,11 +6,11 @@ dev.galasa dev.galasa.wrapping.parent - 0.41.0 + 0.42.0 dev.galasa.wrapping.httpclient-osgi - 0.41.0 + 0.42.0 bundle Galasa wrapped version of org.apache.httpcomponents:httpclient-osgi diff --git a/modules/wrapping/dev.galasa.wrapping.io.grpc.java/pom.xml b/modules/wrapping/dev.galasa.wrapping.io.grpc.java/pom.xml index f8e04c042e..7c1269feb8 100644 --- a/modules/wrapping/dev.galasa.wrapping.io.grpc.java/pom.xml +++ b/modules/wrapping/dev.galasa.wrapping.io.grpc.java/pom.xml @@ -6,11 +6,11 @@ dev.galasa dev.galasa.wrapping.parent - 0.41.0 + 0.42.0 dev.galasa.wrapping.io.grpc.java - 0.41.0 + 0.42.0 bundle Galasa wrapped version of the io.grpc packages required for grpc-java diff --git a/modules/wrapping/dev.galasa.wrapping.io.kubernetes.client-java/pom.xml b/modules/wrapping/dev.galasa.wrapping.io.kubernetes.client-java/pom.xml index fa61868b7e..c529f0ee8a 100644 --- a/modules/wrapping/dev.galasa.wrapping.io.kubernetes.client-java/pom.xml +++ b/modules/wrapping/dev.galasa.wrapping.io.kubernetes.client-java/pom.xml @@ -6,11 +6,11 @@ dev.galasa dev.galasa.wrapping.parent - 0.41.0 + 0.42.0 dev.galasa.wrapping.io.kubernetes.client-java - 0.41.0 + 0.42.0 bundle Galasa wrapped version of io.kubernetes client-java diff --git a/modules/wrapping/dev.galasa.wrapping.jta/pom.xml b/modules/wrapping/dev.galasa.wrapping.jta/pom.xml index 125260f896..d6b3d31ce2 100644 --- a/modules/wrapping/dev.galasa.wrapping.jta/pom.xml +++ b/modules/wrapping/dev.galasa.wrapping.jta/pom.xml @@ -6,11 +6,11 @@ dev.galasa dev.galasa.wrapping.parent - 0.41.0 + 0.42.0 dev.galasa.wrapping.jta - 0.41.0 + 0.42.0 bundle galasa wrapped version of JTA diff --git a/modules/wrapping/dev.galasa.wrapping.kafka.clients/pom.xml b/modules/wrapping/dev.galasa.wrapping.kafka.clients/pom.xml index 6c4fc65e8c..c4b1cc4059 100644 --- a/modules/wrapping/dev.galasa.wrapping.kafka.clients/pom.xml +++ b/modules/wrapping/dev.galasa.wrapping.kafka.clients/pom.xml @@ -6,11 +6,11 @@ dev.galasa dev.galasa.wrapping.parent - 0.41.0 + 0.42.0 dev.galasa.wrapping.kafka.clients - 0.41.0 + 0.42.0 bundle Galasa wrapped version of the kafka-client package diff --git a/modules/wrapping/dev.galasa.wrapping.protobuf-java/pom.xml b/modules/wrapping/dev.galasa.wrapping.protobuf-java/pom.xml index 0763cc13ea..9d29ca3df8 100644 --- a/modules/wrapping/dev.galasa.wrapping.protobuf-java/pom.xml +++ b/modules/wrapping/dev.galasa.wrapping.protobuf-java/pom.xml @@ -6,11 +6,11 @@ dev.galasa dev.galasa.wrapping.parent - 0.41.0 + 0.42.0 dev.galasa.wrapping.protobuf-java - 0.41.0 + 0.42.0 bundle Galasa wrapped version of protobuf-java diff --git a/modules/wrapping/dev.galasa.wrapping.velocity-engine-core/pom.xml b/modules/wrapping/dev.galasa.wrapping.velocity-engine-core/pom.xml index e0630ae545..26e1dd6bd6 100644 --- a/modules/wrapping/dev.galasa.wrapping.velocity-engine-core/pom.xml +++ b/modules/wrapping/dev.galasa.wrapping.velocity-engine-core/pom.xml @@ -6,11 +6,11 @@ dev.galasa dev.galasa.wrapping.parent - 0.41.0 + 0.42.0 dev.galasa.wrapping.velocity-engine-core - 0.41.0 + 0.42.0 bundle Galasa wrapped version of velocity-engine-core diff --git a/modules/wrapping/pom.xml b/modules/wrapping/pom.xml index 8f3370f32d..947e1d61ab 100644 --- a/modules/wrapping/pom.xml +++ b/modules/wrapping/pom.xml @@ -5,7 +5,7 @@ dev.galasa dev.galasa.wrapping.parent - 0.41.0 + 0.42.0 pom Galasa OSGi Wrapping @@ -63,7 +63,7 @@ dev.galasa dev.galasa.platform - 0.41.0 + 0.42.0 pom import From faee70f7f73b08615f91f792aec4bc4ce95ee105 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 7 May 2025 10:56:47 +0100 Subject: [PATCH 02/17] Update custom CodeQL check for CLI Signed-off-by: Jade Carino --- .github/workflows/cli-codeql.yml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cli-codeql.yml b/.github/workflows/cli-codeql.yml index 75c1bb2c21..fdf705d727 100644 --- a/.github/workflows/cli-codeql.yml +++ b/.github/workflows/cli-codeql.yml @@ -57,7 +57,13 @@ jobs: # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages steps: - - name: Checkout repository + - name: Checkout Platform + uses: actions/checkout@v4 + with: + sparse-checkout: + modules/platform + + - name: Checkout CLI uses: actions/checkout@v4 with: sparse-checkout: @@ -76,6 +82,20 @@ jobs: # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs # queries: security-extended,security-and-quality + # This is needed as the dev.galasa.platform is a dependency of the CLI. + # dev.galasa.platform will be needed in the GitHub runner local Maven repo. + - name: Building Platform (manually) + if: matrix.build-mode == 'manual' + shell: bash + working-directory: ./modules/platform + run: | + set -o pipefail + gradle -b dev.galasa.platform/build.gradle build check publishToMavenLocal --info \ + --no-daemon --console plain \ + -PsourceMaven=https://repo.maven.apache.org/maven2/ \ + -PcentralMaven=https://repo.maven.apache.org/maven2/ \ + -PisMainOrRelease=false 2>&1 | tee build.log + # If the analyze step fails for one of the languages you are analyzing with # "We were unable to automatically build your code", modify the matrix above # to set the build mode to "manual" for that language. Then modify this step From 3434bd9400b4ab8bb793d73816c9ebf709009b9b Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 7 May 2025 11:06:43 +0100 Subject: [PATCH 03/17] Change working dir Signed-off-by: Jade Carino --- .github/workflows/cli-codeql.yml | 4 ++-- .github/workflows/pull-requests.yaml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cli-codeql.yml b/.github/workflows/cli-codeql.yml index fdf705d727..e0935d29f9 100644 --- a/.github/workflows/cli-codeql.yml +++ b/.github/workflows/cli-codeql.yml @@ -87,7 +87,7 @@ jobs: - name: Building Platform (manually) if: matrix.build-mode == 'manual' shell: bash - working-directory: ./modules/platform + working-directory: ${{ github.workspace }}/modules/platform run: | set -o pipefail gradle -b dev.galasa.platform/build.gradle build check publishToMavenLocal --info \ @@ -105,7 +105,7 @@ jobs: - name: Building CLI (manually) if: matrix.build-mode == 'manual' shell: bash - working-directory: ./modules/cli + working-directory: ${{ github.workspace }}/modules/cli run: | set -o pipefail gradle -b build.gradle installJarsIntoTemplates --info \ diff --git a/.github/workflows/pull-requests.yaml b/.github/workflows/pull-requests.yaml index 0539001f45..7e69cbe6b7 100644 --- a/.github/workflows/pull-requests.yaml +++ b/.github/workflows/pull-requests.yaml @@ -7,7 +7,8 @@ name: Pull Request Build Orchestrator on: pull_request: - branches: [main] + # branches: [main] + branches: [jade] jobs: From cccf9a0c51a593843307b218bf8e560d09b6bbb4 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 7 May 2025 11:09:25 +0100 Subject: [PATCH 04/17] The checkouts should be the same step Signed-off-by: Jade Carino --- .github/workflows/cli-codeql.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/cli-codeql.yml b/.github/workflows/cli-codeql.yml index e0935d29f9..05bd85f547 100644 --- a/.github/workflows/cli-codeql.yml +++ b/.github/workflows/cli-codeql.yml @@ -57,16 +57,11 @@ jobs: # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages steps: - - name: Checkout Platform + - name: Checkout repository uses: actions/checkout@v4 with: sparse-checkout: modules/platform - - - name: Checkout CLI - uses: actions/checkout@v4 - with: - sparse-checkout: modules/cli # Initializes the CodeQL tools for scanning. From a336badae45ed65f3753dd7e0fca39a27a7e3225 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 7 May 2025 11:13:37 +0100 Subject: [PATCH 05/17] Remove paths in 'on' section Signed-off-by: Jade Carino --- .github/workflows/cli-codeql.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cli-codeql.yml b/.github/workflows/cli-codeql.yml index 05bd85f547..7f20ceb7c5 100644 --- a/.github/workflows/cli-codeql.yml +++ b/.github/workflows/cli-codeql.yml @@ -14,10 +14,10 @@ name: "CodeQL Advanced" on: push: branches: [ "main" ] - paths: [ "modules/cli/**" ] + # paths: [ "modules/cli/**" ] pull_request: branches: [ "main" ] - paths: [ "modules/cli/**" ] + # paths: [ "modules/cli/**" ] schedule: - cron: '41 13 * * 0' From 31d5d49338473f1f3ce49973b8be5c861123634f Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 7 May 2025 11:15:51 +0100 Subject: [PATCH 06/17] Test: list repo contents Signed-off-by: Jade Carino --- .github/workflows/cli-codeql.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/cli-codeql.yml b/.github/workflows/cli-codeql.yml index 7f20ceb7c5..73fcd81884 100644 --- a/.github/workflows/cli-codeql.yml +++ b/.github/workflows/cli-codeql.yml @@ -64,6 +64,11 @@ jobs: modules/platform modules/cli + - name: List repository contents + working-directory: ${{ github.workspace }} + run: | + ls + # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v3 From 69acc341cd14936c5e130cb4540fc040f3d53c6e Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 7 May 2025 11:19:41 +0100 Subject: [PATCH 07/17] Fix sparse-checkout Signed-off-by: Jade Carino --- .github/workflows/cli-codeql.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cli-codeql.yml b/.github/workflows/cli-codeql.yml index 73fcd81884..8d2b15c1af 100644 --- a/.github/workflows/cli-codeql.yml +++ b/.github/workflows/cli-codeql.yml @@ -60,7 +60,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 with: - sparse-checkout: + sparse-checkout: | modules/platform modules/cli From e08f25a3574561d09ea0a28f62d02902848214e4 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 7 May 2025 11:22:01 +0100 Subject: [PATCH 08/17] Fix missing targetMaven Signed-off-by: Jade Carino --- .github/workflows/cli-codeql.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cli-codeql.yml b/.github/workflows/cli-codeql.yml index 8d2b15c1af..1fba132001 100644 --- a/.github/workflows/cli-codeql.yml +++ b/.github/workflows/cli-codeql.yml @@ -94,6 +94,7 @@ jobs: --no-daemon --console plain \ -PsourceMaven=https://repo.maven.apache.org/maven2/ \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ + -PtargetMaven=${{ github.workspace }}/repo -PisMainOrRelease=false 2>&1 | tee build.log # If the analyze step fails for one of the languages you are analyzing with From 8064997bac62da95d16db05333bb765b42b1d5e6 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 7 May 2025 11:26:46 +0100 Subject: [PATCH 09/17] Fix targetMaven to the local maven repo Signed-off-by: Jade Carino --- .github/workflows/cli-codeql.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cli-codeql.yml b/.github/workflows/cli-codeql.yml index 1fba132001..c55a16d12c 100644 --- a/.github/workflows/cli-codeql.yml +++ b/.github/workflows/cli-codeql.yml @@ -94,8 +94,7 @@ jobs: --no-daemon --console plain \ -PsourceMaven=https://repo.maven.apache.org/maven2/ \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ - -PtargetMaven=${{ github.workspace }}/repo - -PisMainOrRelease=false 2>&1 | tee build.log + -PtargetMaven=/home/runner/.m2/ 2>&1 | tee build.log # If the analyze step fails for one of the languages you are analyzing with # "We were unable to automatically build your code", modify the matrix above @@ -113,7 +112,7 @@ jobs: --no-daemon --console plain \ -PsourceMaven=https://development.galasa.dev/main/maven-repo/obr \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ - -PtargetMaven=${{ github.workspace }}/repo 2>&1 | tee build.log + -PtargetMaven=/home/runner/.m2/ 2>&1 | tee build.log docker run --rm --user $(id -u):$(id -g) -v ${{ github.workspace }}/modules/cli:/var/workspace ghcr.io/galasa-dev/openapi:main \ java -jar /opt/openapi/openapi-generator-cli.jar generate \ -i /var/workspace/build/dependencies/openapi.yaml \ From b126184b5103fb43b91031199e60a790bbbb9d22 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 7 May 2025 11:28:17 +0100 Subject: [PATCH 10/17] Change publishToMavenLocal to publish Signed-off-by: Jade Carino --- .github/workflows/cli-codeql.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cli-codeql.yml b/.github/workflows/cli-codeql.yml index c55a16d12c..5c992fb6a9 100644 --- a/.github/workflows/cli-codeql.yml +++ b/.github/workflows/cli-codeql.yml @@ -90,7 +90,7 @@ jobs: working-directory: ${{ github.workspace }}/modules/platform run: | set -o pipefail - gradle -b dev.galasa.platform/build.gradle build check publishToMavenLocal --info \ + gradle -b dev.galasa.platform/build.gradle build check publish --info \ --no-daemon --console plain \ -PsourceMaven=https://repo.maven.apache.org/maven2/ \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ From 92e080bdd9858dd114ecc61a2dc8cb7e37d90dc2 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 7 May 2025 11:31:23 +0100 Subject: [PATCH 11/17] Fix targetMaven location for platform build Signed-off-by: Jade Carino --- .github/workflows/cli-codeql.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cli-codeql.yml b/.github/workflows/cli-codeql.yml index 5c992fb6a9..f772e72da8 100644 --- a/.github/workflows/cli-codeql.yml +++ b/.github/workflows/cli-codeql.yml @@ -94,7 +94,7 @@ jobs: --no-daemon --console plain \ -PsourceMaven=https://repo.maven.apache.org/maven2/ \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ - -PtargetMaven=/home/runner/.m2/ 2>&1 | tee build.log + -PtargetMaven=/home/runner/.m2/repository 2>&1 | tee build.log # If the analyze step fails for one of the languages you are analyzing with # "We were unable to automatically build your code", modify the matrix above From 68447a3a7277316ff975d6889d1a9b458caeba96 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 7 May 2025 13:18:33 +0100 Subject: [PATCH 12/17] Add manual build for Wrapping Signed-off-by: Jade Carino --- .github/workflows/cli-codeql.yml | 95 ++++++++++++++++++++++++++------ 1 file changed, 77 insertions(+), 18 deletions(-) diff --git a/.github/workflows/cli-codeql.yml b/.github/workflows/cli-codeql.yml index f772e72da8..bf42475621 100644 --- a/.github/workflows/cli-codeql.yml +++ b/.github/workflows/cli-codeql.yml @@ -47,6 +47,7 @@ jobs: matrix: include: - language: go + - language: java-kotlin build-mode: manual # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' # Use `c-cpp` to analyze code written in C, C++ or both @@ -59,15 +60,10 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 - with: - sparse-checkout: | - modules/platform - modules/cli - - - name: List repository contents - working-directory: ${{ github.workspace }} - run: | - ls + # with: + # sparse-checkout: | + # modules/platform + # modules/cli # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL @@ -82,8 +78,13 @@ jobs: # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs # queries: security-extended,security-and-quality - # This is needed as the dev.galasa.platform is a dependency of the CLI. - # dev.galasa.platform will be needed in the GitHub runner local Maven repo. + # If the analyze step fails for one of the languages you are analyzing with + # "We were unable to automatically build your code", modify the matrix above + # to set the build mode to "manual" for that language. Then modify this step + # to build your code. + # ℹī¸ Command-line programs to run using the OS shell. + # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun + - name: Building Platform (manually) if: matrix.build-mode == 'manual' shell: bash @@ -96,12 +97,70 @@ jobs: -PcentralMaven=https://repo.maven.apache.org/maven2/ \ -PtargetMaven=/home/runner/.m2/repository 2>&1 | tee build.log - # If the analyze step fails for one of the languages you are analyzing with - # "We were unable to automatically build your code", modify the matrix above - # to set the build mode to "manual" for that language. Then modify this step - # to build your code. - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun + # - name: Building Buildutils (manually) + # if: matrix.build-mode == 'manual' + # shell: bash + # working-directory: ${{ github.workspace }}/modules/buildutils + # run: | + + - name: Building Wrapping (manually) + if: matrix.build-mode == 'manual' + shell: bash + working-directory: ${{ github.workspace }}/modules/wrapping + run: | + set -o pipefail + mvn deploy \ + -Dgalasa.source.repo=https://development.galasa.dev/main/maven-repo/obr \ + -Dgalasa.central.repo=https://repo.maven.apache.org/maven2/ \ + -Dgalasa.release.repo=file:///home/runner/.m2/repository \ + -Dgalasa.jacocoEnabled=false \ + -Dgalasa.isRelease=false \ + -Dgpg.skip=true \ + --batch-mode --errors --fail-at-end \ + --settings settings.xml 2>&1 | tee build.log + + # - name: Building Gradle (manually) + # if: matrix.build-mode == 'manual' + # shell: bash + # working-directory: ${{ github.workspace }}/modules/gradle + # run: | + + # - name: Building Maven (manually) + # if: matrix.build-mode == 'manual' + # shell: bash + # working-directory: ${{ github.workspace }}/modules/maven + # run: | + + # - name: Building Framework (manually) + # if: matrix.build-mode == 'manual' + # shell: bash + # working-directory: ${{ github.workspace }}/modules/framework + # run: | + + # - name: Building Extensions (manually) + # if: matrix.build-mode == 'manual' + # shell: bash + # working-directory: ${{ github.workspace }}/modules/extensions + # run: | + + # - name: Building Managers (manually) + # if: matrix.build-mode == 'manual' + # shell: bash + # working-directory: ${{ github.workspace }}/modules/managers + # run: | + + # - name: Building OBR (manually) + # if: matrix.build-mode == 'manual' + # shell: bash + # working-directory: ${{ github.workspace }}/modules/obr + # run: | + + # - name: Building IVTs (manually) + # if: matrix.build-mode == 'manual' + # shell: bash + # working-directory: ${{ github.workspace }}/modules/ivts + # run: | + - name: Building CLI (manually) if: matrix.build-mode == 'manual' shell: bash @@ -112,7 +171,7 @@ jobs: --no-daemon --console plain \ -PsourceMaven=https://development.galasa.dev/main/maven-repo/obr \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ - -PtargetMaven=/home/runner/.m2/ 2>&1 | tee build.log + -PtargetMaven=/home/runner/.m2/repository 2>&1 | tee build.log docker run --rm --user $(id -u):$(id -g) -v ${{ github.workspace }}/modules/cli:/var/workspace ghcr.io/galasa-dev/openapi:main \ java -jar /opt/openapi/openapi-generator-cli.jar generate \ -i /var/workspace/build/dependencies/openapi.yaml \ From 4e0909005c06e0fd9a13f941a242083e5d22e17e Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 7 May 2025 13:33:31 +0100 Subject: [PATCH 13/17] Add Gradle and Maven build Signed-off-by: Jade Carino --- .github/workflows/cli-codeql.yml | 41 +++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/.github/workflows/cli-codeql.yml b/.github/workflows/cli-codeql.yml index bf42475621..05c0f1f92e 100644 --- a/.github/workflows/cli-codeql.yml +++ b/.github/workflows/cli-codeql.yml @@ -47,6 +47,7 @@ jobs: matrix: include: - language: go + build-mode: manual - language: java-kotlin build-mode: manual # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' @@ -119,17 +120,35 @@ jobs: --batch-mode --errors --fail-at-end \ --settings settings.xml 2>&1 | tee build.log - # - name: Building Gradle (manually) - # if: matrix.build-mode == 'manual' - # shell: bash - # working-directory: ${{ github.workspace }}/modules/gradle - # run: | + - name: Building Gradle (manually) + if: matrix.build-mode == 'manual' + shell: bash + working-directory: ${{ github.workspace }}/modules/gradle + run: | + set -o pipefail + gradle check publish --info \ + --no-daemon --console plain \ + -PsourceMaven=https://development.galasa.dev/main/maven-repo/obr \ + -PcentralMaven=https://repo.maven.apache.org/maven2/ \ + -PtargetMaven=/home/runner/.m2/repository \ + -PjacocoEnabled=false \ + -PisMainOrRelease=false 2>&1 | tee build.log - # - name: Building Maven (manually) - # if: matrix.build-mode == 'manual' - # shell: bash - # working-directory: ${{ github.workspace }}/modules/maven - # run: | + - name: Building Maven (manually) + if: matrix.build-mode == 'manual' + shell: bash + working-directory: ${{ github.workspace }}/modules/maven + run: | + set -o pipefail + mvn -f galasa-maven-plugin/pom.xml deploy -X \ + -Dgalasa.source.repo=https://development.galasa.dev/main/maven-repo/obr \ + -Dgalasa.central.repo=https://repo.maven.apache.org/maven2/ \ + -Dgalasa.release.repo=file:///home/runner/.m2/repository \ + -Dgalasa.jacocoEnabled=false \ + -Dgalasa.isRelease=false \ + -Dgpg.skip=true \ + --batch-mode --errors --fail-at-end \ + --settings settings.xml 2>&1 | tee build.log # - name: Building Framework (manually) # if: matrix.build-mode == 'manual' @@ -195,4 +214,4 @@ jobs: uses: github/codeql-action/analyze@v3 with: category: "/language:${{ matrix.language }}/run:${{github.run_id}}" - checkout_path: ${{ github.workspace }}/modules/cli \ No newline at end of file + checkout_path: ${{ github.workspace }} \ No newline at end of file From fc76a5b83354a9b41dcfde96b1d5184bde2b32dd Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 7 May 2025 14:24:13 +0100 Subject: [PATCH 14/17] Add manual build for all modules Signed-off-by: Jade Carino --- .github/workflows/cli-codeql.yml | 126 ++++++++++++++++++++++--------- 1 file changed, 92 insertions(+), 34 deletions(-) diff --git a/.github/workflows/cli-codeql.yml b/.github/workflows/cli-codeql.yml index 05c0f1f92e..d53bd3c23b 100644 --- a/.github/workflows/cli-codeql.yml +++ b/.github/workflows/cli-codeql.yml @@ -98,11 +98,13 @@ jobs: -PcentralMaven=https://repo.maven.apache.org/maven2/ \ -PtargetMaven=/home/runner/.m2/repository 2>&1 | tee build.log - # - name: Building Buildutils (manually) - # if: matrix.build-mode == 'manual' - # shell: bash - # working-directory: ${{ github.workspace }}/modules/buildutils - # run: | + - name: Building Buildutils (manually) + if: matrix.build-mode == 'manual' + shell: bash + working-directory: ${{ github.workspace }}/modules/buildutils + run: | + make all + make all -C openapi2beans - name: Building Wrapping (manually) if: matrix.build-mode == 'manual' @@ -150,35 +152,91 @@ jobs: --batch-mode --errors --fail-at-end \ --settings settings.xml 2>&1 | tee build.log - # - name: Building Framework (manually) - # if: matrix.build-mode == 'manual' - # shell: bash - # working-directory: ${{ github.workspace }}/modules/framework - # run: | - - # - name: Building Extensions (manually) - # if: matrix.build-mode == 'manual' - # shell: bash - # working-directory: ${{ github.workspace }}/modules/extensions - # run: | - - # - name: Building Managers (manually) - # if: matrix.build-mode == 'manual' - # shell: bash - # working-directory: ${{ github.workspace }}/modules/managers - # run: | - - # - name: Building OBR (manually) - # if: matrix.build-mode == 'manual' - # shell: bash - # working-directory: ${{ github.workspace }}/modules/obr - # run: | - - # - name: Building IVTs (manually) - # if: matrix.build-mode == 'manual' - # shell: bash - # working-directory: ${{ github.workspace }}/modules/ivts - # run: | + - name: Building Framework (manually) + if: matrix.build-mode == 'manual' + shell: bash + working-directory: ${{ github.workspace }}/modules/framework + env: + YAML_LOCATION: "modules/framework/galasa-parent/dev.galasa.framework.api.openapi/src/main/resources/openapi.yaml" + OUTPUT_LOCATION: "modules/framework/galasa-parent/dev.galasa.framework.api.beans/src/main/java" + PACKAGE: "dev.galasa.framework.api.beans.generated" + run: | + docker run --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/openapi2beans:main generate --yaml var/workspace/${{ env.YAML_LOCATION }} --output var/workspace/${{ env.OUTPUT_LOCATION }} --package ${{ env.PACKAGE }} + set -o pipefail + gradle -b galasa-parent/build.gradle check publish --info \ + --no-daemon --console plain \ + -Dorg.gradle.jvmargs=-Xmx5120M \ + -PsourceMaven=https://development.galasa.dev/main/maven-repo/obr \ + -PcentralMaven=https://repo.maven.apache.org/maven2/ \ + -PtargetMaven=/home/runner/.m2/repository\ + -PjacocoEnabled=false \ + -PisMainOrRelease=false 2>&1 | tee build.log + + - name: Building Extensions (manually) + if: matrix.build-mode == 'manual' + shell: bash + working-directory: ${{ github.workspace }}/modules/extensions + run: | + set -o pipefail + gradle -b galasa-extensions-parent/build.gradle check publish --info \ + --no-daemon --console plain \ + -PsourceMaven=https://development.galasa.dev/main/maven-repo/obr \ + -PcentralMaven=https://repo.maven.apache.org/maven2/ \ + -PtargetMaven=/home/runner/.m2/repository \ + -PjacocoEnabled=false \ + -PisMainOrRelease=false 2>&1 | tee build.log + + - name: Building Managers (manually) + if: matrix.build-mode == 'manual' + shell: bash + working-directory: ${{ github.workspace }}/modules/managers + run: | + set -o pipefail + gradle -b galasa-managers-parent/build.gradle check publish --info \ + --no-daemon --console plain \ + -Dorg.gradle.jvmargs=-Xmx4096M \ + -PsourceMaven=https://development.galasa.dev/main/maven-repo/obr \ + -PcentralMaven=https://repo.maven.apache.org/maven2/ \ + -PtargetMaven=/home/runner/.m2/repository \ + -PjacocoEnabled=false \ + -PisMainOrRelease=false 2>&1 | tee build.log + + - name: Building OBR (manually) + if: matrix.build-mode == 'manual' + shell: bash + working-directory: ${{ github.workspace }}/modules/obr + run: | + docker run --rm -v ${{ github.workspace }}/modules:/var/root/ ghcr.io/galasa-dev/galasabld-amd64:main template --releaseMetadata var/root/framework/release.yaml --releaseMetadata /var/root/extensions/release.yaml --releaseMetadata /var/root/managers/release.yaml --releaseMetadata /var/root/obr/release.yaml --template /var/root/obr/galasa-bom/pom.template --output /var/root/obr/galasa-bom/pom.xml --bom + set -o pipefail + mvn -f galasa-bom/pom.xml deploy -X \ + -Dgalasa.source.repo=https://development.galasa.dev/main/maven-repo/obr \ + -Dgalasa.central.repo=https://repo.maven.apache.org/maven2/ \ + -Dgalasa.release.repo=file:///home/runner/.m2/repository \ + -Dgpg.skip=true \ + --batch-mode --errors --fail-at-end \ + --settings settings.xml 2>&1 | tee galasa-bom-build.log + docker run --rm -v ${{ github.workspace }}/modules:/var/root/ ghcr.io/galasa-dev/galasabld-amd64:main template --releaseMetadata var/root/framework/release.yaml --releaseMetadata /var/root/extensions/release.yaml --releaseMetadata /var/root/managers/release.yaml --releaseMetadata /var/root/obr/release.yaml --template /var/root/obr/dev.galasa.uber.obr/pom.template --output /var/root/obr/dev.galasa.uber.obr/pom.xml --obr + set -o pipefail + mvn -f dev.galasa.uber.obr/pom.xml deploy -X \ + -Dgalasa.source.repo=https://development.galasa.dev/main/maven-repo/obr \ + -Dgalasa.central.repo=https://repo.maven.apache.org/maven2/ \ + -Dgalasa.release.repo=file:///home/runner/.m2/repository \ + -Dgpg.skip=true \ + --batch-mode --errors --fail-at-end \ + --settings settings.xml 2>&1 | tee galasa-obr-build.log + + - name: Building IVTs (manually) + if: matrix.build-mode == 'manual' + shell: bash + working-directory: ${{ github.workspace }}/modules/ivts + run: | + set -o pipefail + gradle build check publish --info \ + --no-daemon --console plain \ + -PsourceMaven=https://development.galasa.dev/main/maven-repo/obr \ + -PcentralMaven=https://repo.maven.apache.org/maven2/ \ + -PtargetMaven=/home/runner/.m2/repository \ + -PisMainOrRelease=false 2>&1 | tee build.log - name: Building CLI (manually) if: matrix.build-mode == 'manual' From d73daca0f4a8ea0e0968b091df387c1faa2caba6 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 7 May 2025 14:41:18 +0100 Subject: [PATCH 15/17] Fix incorrect path for IVTs gradle file Signed-off-by: Jade Carino --- .github/workflows/cli-codeql.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/cli-codeql.yml b/.github/workflows/cli-codeql.yml index d53bd3c23b..bc6b6b20f6 100644 --- a/.github/workflows/cli-codeql.yml +++ b/.github/workflows/cli-codeql.yml @@ -14,10 +14,8 @@ name: "CodeQL Advanced" on: push: branches: [ "main" ] - # paths: [ "modules/cli/**" ] pull_request: branches: [ "main" ] - # paths: [ "modules/cli/**" ] schedule: - cron: '41 13 * * 0' @@ -61,10 +59,6 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 - # with: - # sparse-checkout: | - # modules/platform - # modules/cli # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL @@ -231,7 +225,7 @@ jobs: working-directory: ${{ github.workspace }}/modules/ivts run: | set -o pipefail - gradle build check publish --info \ + gradle -b galasa-ivts-parent/build.gradle build check publish --info \ --no-daemon --console plain \ -PsourceMaven=https://development.galasa.dev/main/maven-repo/obr \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ From bb8a2f4a60256ce000242d87e5cda48cf2056732 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 7 May 2025 14:51:03 +0100 Subject: [PATCH 16/17] Remove matrix from the workflow Signed-off-by: Jade Carino --- .github/workflows/cli-codeql.yml | 54 +++++++++++++------------------- 1 file changed, 21 insertions(+), 33 deletions(-) diff --git a/.github/workflows/cli-codeql.yml b/.github/workflows/cli-codeql.yml index bc6b6b20f6..635412ff16 100644 --- a/.github/workflows/cli-codeql.yml +++ b/.github/workflows/cli-codeql.yml @@ -22,13 +22,13 @@ on: jobs: analyze: - name: Analyze (${{ matrix.language }}) + name: Analyze Galasa # Runner size impacts CodeQL analysis time. To learn more, please see: # - https://gh.io/recommended-hardware-resources-for-running-codeql # - https://gh.io/supported-runners-and-hardware-resources # - https://gh.io/using-larger-runners (GitHub.com only) # Consider using larger runners or machines with greater resources for possible analysis time improvements. - runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} + runs-on: ${{ 'ubuntu-latest' }} permissions: # required for all workflows security-events: write @@ -40,22 +40,15 @@ jobs: actions: read contents: read - strategy: - fail-fast: false - matrix: - include: - - language: go - build-mode: manual - - language: java-kotlin - build-mode: manual - # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' - # Use `c-cpp` to analyze code written in C, C++ or both - # Use 'java-kotlin' to analyze code written in Java, Kotlin or both - # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both - # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis, - # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning. - # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how - # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages + # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' + # Use `c-cpp` to analyze code written in C, C++ or both + # Use 'java-kotlin' to analyze code written in Java, Kotlin or both + # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both + # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis, + # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning. + # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how + # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages + steps: - name: Checkout repository uses: actions/checkout@v4 @@ -64,8 +57,8 @@ jobs: - name: Initialize CodeQL uses: github/codeql-action/init@v3 with: - languages: ${{ matrix.language }} - build-mode: ${{ matrix.build-mode }} + languages: java-kotlin, go + build-mode: manual # If you wish to specify custom queries, you can do so here or in a config file. # By default, queries listed here will override any specified in a config file. # Prefix the list here with "+" to use these queries and those in the config file. @@ -81,7 +74,6 @@ jobs: # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun - name: Building Platform (manually) - if: matrix.build-mode == 'manual' shell: bash working-directory: ${{ github.workspace }}/modules/platform run: | @@ -93,7 +85,6 @@ jobs: -PtargetMaven=/home/runner/.m2/repository 2>&1 | tee build.log - name: Building Buildutils (manually) - if: matrix.build-mode == 'manual' shell: bash working-directory: ${{ github.workspace }}/modules/buildutils run: | @@ -101,7 +92,6 @@ jobs: make all -C openapi2beans - name: Building Wrapping (manually) - if: matrix.build-mode == 'manual' shell: bash working-directory: ${{ github.workspace }}/modules/wrapping run: | @@ -117,7 +107,6 @@ jobs: --settings settings.xml 2>&1 | tee build.log - name: Building Gradle (manually) - if: matrix.build-mode == 'manual' shell: bash working-directory: ${{ github.workspace }}/modules/gradle run: | @@ -131,7 +120,6 @@ jobs: -PisMainOrRelease=false 2>&1 | tee build.log - name: Building Maven (manually) - if: matrix.build-mode == 'manual' shell: bash working-directory: ${{ github.workspace }}/modules/maven run: | @@ -147,7 +135,6 @@ jobs: --settings settings.xml 2>&1 | tee build.log - name: Building Framework (manually) - if: matrix.build-mode == 'manual' shell: bash working-directory: ${{ github.workspace }}/modules/framework env: @@ -167,7 +154,6 @@ jobs: -PisMainOrRelease=false 2>&1 | tee build.log - name: Building Extensions (manually) - if: matrix.build-mode == 'manual' shell: bash working-directory: ${{ github.workspace }}/modules/extensions run: | @@ -181,7 +167,6 @@ jobs: -PisMainOrRelease=false 2>&1 | tee build.log - name: Building Managers (manually) - if: matrix.build-mode == 'manual' shell: bash working-directory: ${{ github.workspace }}/modules/managers run: | @@ -196,7 +181,6 @@ jobs: -PisMainOrRelease=false 2>&1 | tee build.log - name: Building OBR (manually) - if: matrix.build-mode == 'manual' shell: bash working-directory: ${{ github.workspace }}/modules/obr run: | @@ -220,7 +204,6 @@ jobs: --settings settings.xml 2>&1 | tee galasa-obr-build.log - name: Building IVTs (manually) - if: matrix.build-mode == 'manual' shell: bash working-directory: ${{ github.workspace }}/modules/ivts run: | @@ -233,7 +216,6 @@ jobs: -PisMainOrRelease=false 2>&1 | tee build.log - name: Building CLI (manually) - if: matrix.build-mode == 'manual' shell: bash working-directory: ${{ github.workspace }}/modules/cli run: | @@ -262,8 +244,14 @@ jobs: cat pkg/cmd/root.go make all - - name: Perform CodeQL Analysis + - name: Perform CodeQL Analysis Java + uses: github/codeql-action/analyze@v3 + with: + category: "/language:java-kotlin/run:${{ github.run_id }}" + checkout_path: ${{ github.workspace }} + + - name: Perform CodeQL Analysis Go uses: github/codeql-action/analyze@v3 with: - category: "/language:${{ matrix.language }}/run:${{github.run_id}}" + category: "/language:go/run:${{ github.run_id }}" checkout_path: ${{ github.workspace }} \ No newline at end of file From 375833ddbb9fc8f564529ced793c810949ec532e Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 7 May 2025 15:23:57 +0100 Subject: [PATCH 17/17] Use 'none' build mode for Java scanning and 'manual' for Go Signed-off-by: Jade Carino --- .../workflows/{cli-codeql.yml => codeql.yml} | 72 ++++++++++++++++--- 1 file changed, 62 insertions(+), 10 deletions(-) rename .github/workflows/{cli-codeql.yml => codeql.yml} (78%) diff --git a/.github/workflows/cli-codeql.yml b/.github/workflows/codeql.yml similarity index 78% rename from .github/workflows/cli-codeql.yml rename to .github/workflows/codeql.yml index 635412ff16..70af5c08b2 100644 --- a/.github/workflows/cli-codeql.yml +++ b/.github/workflows/codeql.yml @@ -21,8 +21,8 @@ on: - cron: '41 13 * * 0' jobs: - analyze: - name: Analyze Galasa + analyze-java: + name: Analyze (Java) # Runner size impacts CodeQL analysis time. To learn more, please see: # - https://gh.io/recommended-hardware-resources-for-running-codeql # - https://gh.io/supported-runners-and-hardware-resources @@ -57,7 +57,65 @@ jobs: - name: Initialize CodeQL uses: github/codeql-action/init@v3 with: - languages: java-kotlin, go + languages: java-kotlin + build-mode: none + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + + # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs + # queries: security-extended,security-and-quality + + # If the analyze step fails for one of the languages you are analyzing with + # "We were unable to automatically build your code", modify the matrix above + # to set the build mode to "manual" for that language. Then modify this step + # to build your code. + # ℹī¸ Command-line programs to run using the OS shell. + # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun + + - name: Perform CodeQL Analysis Java + uses: github/codeql-action/analyze@v3 + with: + category: "/language:java-kotlin/run:${{ github.run_id }}" + checkout_path: ${{ github.workspace }} + + analyze-go: + name: Analyze (Go) + # Runner size impacts CodeQL analysis time. To learn more, please see: + # - https://gh.io/recommended-hardware-resources-for-running-codeql + # - https://gh.io/supported-runners-and-hardware-resources + # - https://gh.io/using-larger-runners (GitHub.com only) + # Consider using larger runners or machines with greater resources for possible analysis time improvements. + runs-on: ${{ 'ubuntu-latest' }} + permissions: + # required for all workflows + security-events: write + + # required to fetch internal or private CodeQL packs + packages: read + + # only required for workflows in private repositories + actions: read + contents: read + + # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' + # Use `c-cpp` to analyze code written in C, C++ or both + # Use 'java-kotlin' to analyze code written in Java, Kotlin or both + # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both + # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis, + # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning. + # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how + # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 + with: + languages: go build-mode: manual # If you wish to specify custom queries, you can do so here or in a config file. # By default, queries listed here will override any specified in a config file. @@ -149,7 +207,7 @@ jobs: -Dorg.gradle.jvmargs=-Xmx5120M \ -PsourceMaven=https://development.galasa.dev/main/maven-repo/obr \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ - -PtargetMaven=/home/runner/.m2/repository\ + -PtargetMaven=/home/runner/.m2/repository \ -PjacocoEnabled=false \ -PisMainOrRelease=false 2>&1 | tee build.log @@ -244,12 +302,6 @@ jobs: cat pkg/cmd/root.go make all - - name: Perform CodeQL Analysis Java - uses: github/codeql-action/analyze@v3 - with: - category: "/language:java-kotlin/run:${{ github.run_id }}" - checkout_path: ${{ github.workspace }} - - name: Perform CodeQL Analysis Go uses: github/codeql-action/analyze@v3 with: