This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a commit to branch 2.3-gae
in repository https://gitbox.apache.org/repos/asf/freemarker.git
The following commit(s) were added to refs/heads/2.3-gae by this push:
new 43e57dc8 [BUILD] sign and rat-check on CI build
new 79b77fa4 Merge pull request #102 from
bmarwell/2.3-dist-rat-github-action
43e57dc8 is described below
commit 43e57dc80e064627c4355577c5dabe944cea85f7
Author: Benjamin Marwell <[email protected]>
AuthorDate: Tue Nov 7 12:01:19 2023 +0100
[BUILD] sign and rat-check on CI build
---
.github/workflows/ant.yml | 13 ++++++++++++-
build.xml | 9 ++++++---
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
index e2b632eb..a1b380c8 100644
--- a/.github/workflows/ant.yml
+++ b/.github/workflows/ant.yml
@@ -55,10 +55,21 @@ jobs:
echo "mvnCommand=$(which mvn)" >> build.properties;
echo "gpgCommand=$(which gpg)" >> build.properties;
+ - name: Create a gpg key for signing
+ shell: bash
+ run: >-
+ gpg --quick-gen-key --batch --passphrase ''
[email protected];
+ echo "batch" >> "/home/runner/.gnupg/gpg.conf";
+ echo "pinentry-mode=loopback" >> "/home/runner/.gnupg/gpg.conf";
+
- name: Prepare ant with ivy
shell: bash
run: ant download-ivy
- name: Build with Ant and ivy
shell: bash
- run: ant ci
+ run: ant ci -Dci=true
+
+ - name: RAT check
+ shell: bash
+ run: ant rat
diff --git a/build.xml b/build.xml
index a7579b93..6c499af2 100644
--- a/build.xml
+++ b/build.xml
@@ -25,6 +25,8 @@
xmlns:bnd="http://www.aqute.biz/bnd";
xmlns:rat="antlib:org.apache.rat.anttasks"
xmlns:u="http://freemarker.org/util";
+ xmlns:if="ant:if"
+ xmlns:unless="ant:unless"
>
<!-- ================================================================== -->
@@ -748,11 +750,12 @@
<input
validargs="y,n"
addproperty="signatureGood"
+ unless:set="ci"
>Is the above signer the intended one for Apache releases?</input>
- <condition property="signatureGood.y">
+ <condition property="signatureGood.y" unless:set="ci">
<equals arg1="y" arg2="${signatureGood}"/>
</condition>
- <fail unless="signatureGood.y" message="Task aborted by user." />
+ <fail unless:set="ci" unless="signatureGood.y" message="Task aborted by
user." />
<echo>Creating checksum file for "${archive.gzip}"...</echo>
<checksum file="${archive.gzip}" fileext=".sha512" algorithm="SHA-512"
forceOverwrite="yes" />
@@ -952,7 +955,7 @@ Proceed? </input>
</target>
<target name="ci"
- depends="ci-setup, clean, jar, test, javadoc"
+ depends="ci-setup, clean, _dist"
description="CI should invoke this task"
/>
