From 12bcb1157162520231d1fa6675b97356ae705b6c Mon Sep 17 00:00:00 2001 From: Justin Florentine Date: Tue, 30 Jan 2024 19:09:30 -0500 Subject: [PATCH 1/2] align archive versions with docker images, if release version specified Signed-off-by: Justin Florentine --- build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.gradle b/build.gradle index 2d2e610d58d..c8cf32a7595 100644 --- a/build.gradle +++ b/build.gradle @@ -647,6 +647,8 @@ task autocomplete(type: JavaExec) { } } +def archiveBuildVersion = project.hasProperty('release.releaseVersion') ? project.property('release.releaseVersion') : "${rootProject.version}" + installDist { dependsOn checkLicense, untunedStartScripts, evmToolStartScripts } distTar { @@ -655,6 +657,7 @@ distTar { delete fileTree(dir: 'build/distributions', include: '*.tar.gz') } compression = Compression.GZIP + setVersion(archiveBuildVersion) archiveExtension = 'tar.gz' } @@ -663,6 +666,7 @@ distZip { doFirst { delete fileTree(dir: 'build/distributions', include: '*.zip') } + setVersion(archiveBuildVersion) } publishing { From f64398f0acb07e42a132ca4ab667ba8a10f66e41 Mon Sep 17 00:00:00 2001 From: Justin Florentine Date: Tue, 30 Jan 2024 19:13:02 -0500 Subject: [PATCH 2/2] try another permission Signed-off-by: Justin Florentine --- .github/workflows/pr-checklist-on-open.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-checklist-on-open.yml b/.github/workflows/pr-checklist-on-open.yml index d226e618265..f849ba760bb 100644 --- a/.github/workflows/pr-checklist-on-open.yml +++ b/.github/workflows/pr-checklist-on-open.yml @@ -8,7 +8,7 @@ jobs: name: "add checklist as a comment on newly opened PRs" runs-on: ubuntu-22.04 permissions: - contents: write + pull-requests: write steps: - uses: actions/github-script@v7.0.1 with: