diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml new file mode 100644 index 0000000..b57f753 --- /dev/null +++ b/.github/workflows/build-publish.yml @@ -0,0 +1,40 @@ +name: Build and Publish + +# Thin caller around the shared reusable workflow in +# NrgXnat/xnat-ci-workflows. Plugin variant — no GHCR Docker image +# (plugins ship a jar to JFrog only). + +on: + push: + branches: + - main + - develop + - 'releases/*' # RC / release branches, e.g. releases/1.6.0-rc + workflow_dispatch: + inputs: + publish_jfrog: + description: 'Publish jar to JFrog Artifactory (nrgxnat)' + type: boolean + default: false + +permissions: + contents: read + packages: write # required by reusable workflow's publish-ghcr job (gated by if: inputs.publish-ghcr but parsed at startup) + +jobs: + build-publish: + uses: NrgXnat/xnat-ci-workflows/.github/workflows/gradle-build-publish.yml@v1 + with: + # ──── Artifact ──── + artifact-glob: 'build/libs/*.jar' + artifact-name: 'ml-schema-plugin-jar' + + # ──── JFrog ──── + # On any push to a triggered branch: publish. On dispatch: only when publish_jfrog ticked. + publish-jfrog: ${{ github.event_name == 'push' || inputs.publish_jfrog }} + + # publish-ghcr deliberately omitted — defaults to false in the reusable workflow. + + # secrets: inherit passes XNAT_ARTIFACTORY_USER/TOKEN (org-level) and + # the auto-injected GITHUB_TOKEN through to the reusable workflow. + secrets: inherit diff --git a/.github/workflows/release-cut-rc.yml b/.github/workflows/release-cut-rc.yml new file mode 100644 index 0000000..b54e824 --- /dev/null +++ b/.github/workflows/release-cut-rc.yml @@ -0,0 +1,37 @@ +name: Release - Cut RC Branch + +# Thin caller around the shared reusable workflow in NrgXnat/xnat-ci-workflows. +# Cuts a `releases/-rc` branch from source_branch and bumps +# source_branch to the next dev version. All release-cut logic lives in the +# reusable workflow; this file only defines our triggers + inputs. + +on: + workflow_dispatch: + inputs: + next_dev_version: + description: 'Next dev SNAPSHOT version (e.g. 1.7.0-SNAPSHOT)' + type: string + required: true + source_branch: + description: 'Branch to cut from (default: develop)' + type: string + required: false + default: develop + trigger_build: + description: 'After cut, dispatch build/publish on RC and source_branch' + type: boolean + required: false + default: true + +permissions: + contents: write + actions: write # dispatch build-publish workflow + +jobs: + cut-rc: + uses: NrgXnat/xnat-ci-workflows/.github/workflows/gradle-release-cut-rc.yml@v1 + with: + next_dev_version: ${{ inputs.next_dev_version }} + source_branch: ${{ inputs.source_branch }} + trigger_build: ${{ inputs.trigger_build }} + secrets: inherit diff --git a/.github/workflows/release-promote.yml b/.github/workflows/release-promote.yml new file mode 100644 index 0000000..09416fb --- /dev/null +++ b/.github/workflows/release-promote.yml @@ -0,0 +1,37 @@ +name: Release - Promote RC to Main + +# Thin caller around the shared reusable workflow in NrgXnat/xnat-ci-workflows. +# Promotes a stabilized RC branch to a tagged release on target_main. All +# release-promote logic lives in the reusable workflow; this file only defines +# our triggers + inputs. + +on: + workflow_dispatch: + inputs: + rc_branch: + description: 'RC branch to promote (e.g. releases/1.6.0-rc)' + type: string + required: true + target_main: + description: 'Branch to merge into (default main)' + type: string + required: false + default: main + trigger_build: + description: 'After promote, dispatch build/publish on target_main' + type: boolean + required: false + default: true + +permissions: + contents: write # push RC/main + create tag + actions: write # dispatch build-publish workflow + +jobs: + promote: + uses: NrgXnat/xnat-ci-workflows/.github/workflows/gradle-release-promote.yml@v1 + with: + rc_branch: ${{ inputs.rc_branch }} + target_main: ${{ inputs.target_main }} + trigger_build: ${{ inputs.trigger_build }} + secrets: inherit diff --git a/build.gradle b/build.gradle index c5fdffa..f66932c 100644 --- a/build.gradle +++ b/build.gradle @@ -8,23 +8,23 @@ buildscript { ext { - vXnat = "1.8.10" + vXnat = "1.10.1-SNAPSHOT" + vDatasetsSchema = "1.2.0-SNAPSHOT" } dependencies { - classpath "org.nrg.xnatx.plugins:datasets-schema-plugin:1.0.0-SNAPSHOT" + classpath "org.nrg.xnatx.plugins:datasets-schema-plugin:${vDatasetsSchema}" } } plugins { id "java" id "maven-publish" - id "io.spring.dependency-management" version "1.1.0" - id "net.linguica.maven-settings" version "0.5" + id "io.spring.dependency-management" version "1.1.7" id "org.nrg.xnat.build.xnat-data-builder" version "${vXnat}" } group "org.nrg.xnatx.plugins" -version "1.1.0" +version "1.2.0-SNAPSHOT" description = "ML Schema Plugin" @@ -50,9 +50,7 @@ dependencies { implementation("org.nrg.xnat:web") { transitive = false } - implementation("org.nrg.xnat:xnat-data-models") { - transitive = false - } + // xnat-data-models merged into xnat-web in monorepo 1.10 implementation("org.nrg.xdat:core") { transitive = false } @@ -65,7 +63,7 @@ dependencies { transitive = false } - implementation "org.nrg.xnatx.plugins:datasets-schema-plugin:1.0.0-SNAPSHOT" + implementation "org.nrg.xnatx.plugins:datasets-schema-plugin:${vDatasetsSchema}" implementation "org.slf4j:slf4j-api" implementation "org.slf4j:log4j-over-slf4j" } @@ -73,7 +71,7 @@ dependencies { // Apply a specific Java toolchain to ease working on different environments. java { toolchain { - languageVersion = JavaLanguageVersion.of(8) + languageVersion = JavaLanguageVersion.of(21) } } @@ -85,9 +83,17 @@ publishing { } repositories { maven { - url "https://nrgxnat.jfrog.io/nrgxnat/libs-${project.version.endsWith("-SNAPSHOT") ? "snapshot" : "release"}" - // The value for name must match in ~/.m2/settings.xml name = "XNAT_Artifactory" + url = project.version.toString().endsWith("-SNAPSHOT") + ? "https://nrgxnat.jfrog.io/nrgxnat/libs-snapshot-local" + : "https://nrgxnat.jfrog.io/nrgxnat/libs-release-local" + // CI injects ORG_GRADLE_PROJECT_artifactoryUser/Token env vars (Gradle maps + // these to project properties). Local devs can set artifactoryUser/Token in + // ~/.gradle/gradle.properties. Mirrors monorepo's buildSrc convention. + credentials { + username = (project.findProperty("artifactoryUser") ?: System.getenv("ARTIFACTORY_USER")) ?: "" + password = (project.findProperty("artifactoryToken") ?: System.getenv("ARTIFACTORY_TOKEN")) ?: "" + } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23..c61a118 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME