fix(release): 리허설·릴리스 태스크가 프로젝트 좌표를 읽게 한다
releaseRehearsal과 release가 태스크 설정 블록 안에서 `path`·`group`· `version`을 읽었다. 그 자리에서 셋은 프로젝트가 아니라 태스크의 속성이라 루트 publish 태스크 경로를 `:releaseRehearsal:publish…`로 만들고, 좌표를 `release:<모듈>:0.0.0`으로 찾았다. 좌표를 루트에서 한 번 잡아 쓴다. 같이 고친 것: - grpc-core-api의 test fixtures 변형을 publication에서 뺀다. 이 repo 시험끼리 쓰는 지원 코드이고(배포하는 testkit은 grpc-testkit), Maven이 표현하지 못하는 capability라 POM 경고를 냈다. - Trivy 호출에 --skip-version-check. 새 버전 알림이 매번 네트워크를 부르고 로그를 덮었다. 검증(desktop): releaseRehearsal rc=0. 9개 모듈 + SBOM(733 components)이 staging에 올라가고 파일·체크섬 넷·POM/module 의존성 버전 확인 통과. 의존성 검사는 HIGH·CRITICAL 0, KEV 일치 0. 버리는 시험 키로 서명한 리허설도 rc=0, gpg --verify Good signature(키는 임시 폴더째 지웠다).
This commit is contained in:
+18
@@ -1,9 +1,11 @@
|
||||
package dev.caskeleton.buildlogic.publishing;
|
||||
|
||||
import io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension;
|
||||
import java.util.List;
|
||||
import org.gradle.api.GradleException;
|
||||
import org.gradle.api.Plugin;
|
||||
import org.gradle.api.Project;
|
||||
import org.gradle.api.component.AdhocComponentWithVariants;
|
||||
import org.gradle.api.credentials.HttpHeaderCredentials;
|
||||
import org.gradle.api.plugins.JavaPluginExtension;
|
||||
import org.gradle.api.provider.Provider;
|
||||
@@ -58,6 +60,22 @@ public final class LibraryPublishingPlugin implements Plugin<Project> {
|
||||
.getByType(DependencyManagementExtension.class)
|
||||
.generatedPomCustomization(customization -> customization.setEnabled(false));
|
||||
|
||||
// Test fixtures are this repository's own test support (grpc-core-api's, shared by the other
|
||||
// modules' tests); the published testkit is grpc-testkit. They stay out of the publication, which
|
||||
// also keeps a capability Maven cannot express out of the POM.
|
||||
project
|
||||
.getPlugins()
|
||||
.withId(
|
||||
"java-test-fixtures",
|
||||
ignored -> {
|
||||
AdhocComponentWithVariants component =
|
||||
(AdhocComponentWithVariants) project.getComponents().getByName("java");
|
||||
for (String variant : List.of("testFixturesApiElements", "testFixturesRuntimeElements")) {
|
||||
component.withVariantsFromConfiguration(
|
||||
project.getConfigurations().getByName(variant), details -> details.skip());
|
||||
}
|
||||
});
|
||||
|
||||
Provider<String> packagesUrl = project.getProviders().gradleProperty("packagesUrl");
|
||||
Provider<String> repositoryUrl = project.getProviders().gradleProperty("repositoryUrl");
|
||||
Provider<String> token = project.getProviders().environmentVariable("PACKAGES_TOKEN");
|
||||
|
||||
+9
-5
@@ -20,6 +20,8 @@ group = providers.gradleProperty('libraryGroup').get()
|
||||
def revision = JavaConventionsPlugin.sourceRevision(providers)
|
||||
version = JavaConventionsPlugin.releaseVersion(providers) +
|
||||
(revision == JavaConventionsPlugin.UNKNOWN_REVISION ? '-SNAPSHOT' : '')
|
||||
// Captured here: inside a task's configuration `group` and `version` are the task's own properties.
|
||||
def libraryCoordinates = [project.group.toString(), project.version.toString()]
|
||||
|
||||
tasks.register('resolveAndLockAll') {
|
||||
group = 'build setup'
|
||||
@@ -111,7 +113,7 @@ def sbomFile = layout.buildDirectory.file("release/grpc-library-${version}-cyclo
|
||||
tasks.register('verifyReleaseVersion') {
|
||||
group = 'verification'
|
||||
description = 'Fails unless this build names a release version and the commit it was built from.'
|
||||
def releaseVersion = version.toString()
|
||||
def releaseVersion = libraryCoordinates[1]
|
||||
doLast {
|
||||
if (releaseVersion.endsWith('-SNAPSHOT')) {
|
||||
throw new GradleException("No commit id (-PgitRevision, GIT_SHA or GITHUB_SHA): ${releaseVersion} is not a release.")
|
||||
@@ -218,10 +220,11 @@ tasks.register('releaseRehearsal') {
|
||||
group = 'release'
|
||||
description = 'releaseCheck, then publishes every module and the SBOM to build/staging-repository and checks the files.'
|
||||
dependsOn tasks.named('releaseCheck')
|
||||
dependsOn(([path] + leafPaths).collect { "${it == ':' ? '' : it}:publishAllPublicationsToStagingRepository" })
|
||||
dependsOn tasks.named('publishAllPublicationsToStagingRepository')
|
||||
dependsOn leafPaths.collect { "${it}:publishAllPublicationsToStagingRepository" }
|
||||
def staging = layout.buildDirectory.dir('staging-repository')
|
||||
def artifacts = leaves.collect { it.name }
|
||||
def coordinates = [group.toString(), version.toString()]
|
||||
def coordinates = libraryCoordinates
|
||||
def signed = !signingKey.isBlank()
|
||||
def checker = file('scripts/release/check-staging.py')
|
||||
doLast {
|
||||
@@ -241,10 +244,11 @@ tasks.register('release') {
|
||||
group = 'release'
|
||||
description = 'releaseCheck, publish to Gitea Packages, then verify the version is readable anonymously.'
|
||||
dependsOn tasks.named('releaseCheck')
|
||||
dependsOn(([path] + leafPaths).collect { "${it == ':' ? '' : it}:publishAllPublicationsToGiteaRepository" })
|
||||
dependsOn tasks.named('publishAllPublicationsToGiteaRepository')
|
||||
dependsOn leafPaths.collect { "${it}:publishAllPublicationsToGiteaRepository" }
|
||||
def url = providers.gradleProperty('packagesUrl')
|
||||
def artifacts = leaves.collect { it.name } + ['grpc-library']
|
||||
def coordinates = [group.toString(), version.toString()]
|
||||
def coordinates = libraryCoordinates
|
||||
def verifier = file('scripts/release/verify-published.sh')
|
||||
doLast {
|
||||
def command = ['bash', verifier.path, url.get(), coordinates[0], coordinates[1]] + artifacts
|
||||
|
||||
@@ -11,5 +11,5 @@ output=${1:?usage: sbom.sh <output file>}
|
||||
mkdir -p "$(dirname "$output")"
|
||||
trivy=$("$root/scripts/tool.sh" trivy)
|
||||
cd "$root"
|
||||
"$trivy" fs --format cyclonedx --skip-dirs build-logic --output "$output" .
|
||||
"$trivy" fs --skip-version-check --format cyclonedx --skip-dirs build-logic --output "$output" .
|
||||
python3 -c 'import json,sys; d=json.load(open(sys.argv[1])); assert d.get("bomFormat")=="CycloneDX" and d.get("components"), "empty SBOM"; print("sbom:", len(d["components"]), "components")' "$output"
|
||||
|
||||
@@ -16,9 +16,9 @@ mkdir -p "$out"
|
||||
trivy=$("$root/scripts/tool.sh" trivy)
|
||||
cd "$root"
|
||||
|
||||
"$trivy" fs --scanners vuln --severity CRITICAL,HIGH --exit-code 1 --ignorefile .trivyignore.yaml .
|
||||
"$trivy" fs --scanners vuln --severity MEDIUM,LOW --exit-code 0 --ignorefile .trivyignore.yaml .
|
||||
"$trivy" fs --scanners vuln --severity CRITICAL,HIGH,MEDIUM,LOW,UNKNOWN --exit-code 0 \
|
||||
"$trivy" fs --skip-version-check --scanners vuln --severity CRITICAL,HIGH --exit-code 1 --ignorefile .trivyignore.yaml .
|
||||
"$trivy" fs --skip-version-check --scanners vuln --severity MEDIUM,LOW --exit-code 0 --ignorefile .trivyignore.yaml .
|
||||
"$trivy" fs --skip-version-check --scanners vuln --severity CRITICAL,HIGH,MEDIUM,LOW,UNKNOWN --exit-code 0 \
|
||||
--ignorefile .trivyignore.yaml --format json --output "$out/trivy-all.json" .
|
||||
|
||||
kev_url=${KEV_FEED_URL:-https://www.cisa.gov/sites/default/files/feeds/known_exploited_vulnerabilities.json}
|
||||
|
||||
Reference in New Issue
Block a user