From 49cfa5d54a9f16d72e73caffaa1cf6d1cc46dfd1 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 11:42:11 +0800 Subject: [PATCH 01/82] update --- .github/workflows/cd.yml | 2 +- build.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 6d8af6c6..356ce9f2 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -3,7 +3,7 @@ name: Continuous delivery in GitHub and Maven Central Repository on: push: tags: - - 'rc/v*' + - 'rc-test/v*' jobs: create_release_draft: diff --git a/build.gradle b/build.gradle index 074c4d02..90e5ee4c 100644 --- a/build.gradle +++ b/build.gradle @@ -42,7 +42,7 @@ allprojects { targetCompatibility = 1.8 group 'org.nervos.ckb' - version '3.0.0' + version '0.0.11' apply plugin: 'java' repositories { @@ -105,7 +105,7 @@ configure(subprojects.findAll { it.name != 'tests' }) { publications { mavenJava(MavenPublication) { groupId 'org.nervos.ckb' - version '3.0.0' + version '0.0.11' from components.java pom { From 71c0b4dc6e69648e5c2cfda4e5b88f209ff70fef Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 13:17:54 +0800 Subject: [PATCH 02/82] update --- .github/workflows/cd.yml | 3 +++ build.gradle | 1 + 2 files changed, 4 insertions(+) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 356ce9f2..df736f1b 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -39,6 +39,9 @@ jobs: run: | chmod +x ./gradlew ./gradlew shadowJar + echo ls build && ls build + echo tree build && tree build + - name: Upload artifact to Nexus env: ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.NEXUS_OSSRH_USERNAME }} diff --git a/build.gradle b/build.gradle index 90e5ee4c..794c8037 100644 --- a/build.gradle +++ b/build.gradle @@ -14,6 +14,7 @@ buildscript { repositories { mavenCentral() + maven { url 'https://nexus.web.cern.ch/nexus/content/repositories/public/' } } dependencies { From 22a4199fffeea2549497ff52661f605d3881589b Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 14:05:03 +0800 Subject: [PATCH 03/82] Fix ./gradlew javadoc --- ckb/src/main/java/org/nervos/ckb/CkbRpcApi.java | 2 +- .../ckb/transaction/AbstractTransactionBuilder.java | 4 ++++ .../nervos/ckb/transaction/CkbTransactionBuilder.java | 10 ++++++++++ .../nervos/ckb/transaction/handler/ScriptHandler.java | 9 +++++---- .../main/java/org/nervos/ckb/sign/ScriptSigner.java | 6 +++--- 5 files changed, 23 insertions(+), 8 deletions(-) diff --git a/ckb/src/main/java/org/nervos/ckb/CkbRpcApi.java b/ckb/src/main/java/org/nervos/ckb/CkbRpcApi.java index 11965349..02b98af7 100644 --- a/ckb/src/main/java/org/nervos/ckb/CkbRpcApi.java +++ b/ckb/src/main/java/org/nervos/ckb/CkbRpcApi.java @@ -35,7 +35,7 @@ default TransactionWithStatus getTransaction(@Nonnull byte[] transactionHash) th * * @param transactionHash the transaction hash * @return the RPC does not return the transaction content and the field transaction must be null. - * @throws IOException + * @throws IOException Error occurs while communicating with the RPC server or if the transaction hash is invalid */ default TransactionWithStatus getTransactionStatus(@Nonnull byte[] transactionHash) throws IOException { return getTransactionStatus(transactionHash, null); diff --git a/ckb/src/main/java/org/nervos/ckb/transaction/AbstractTransactionBuilder.java b/ckb/src/main/java/org/nervos/ckb/transaction/AbstractTransactionBuilder.java index 8e10c886..709cb072 100644 --- a/ckb/src/main/java/org/nervos/ckb/transaction/AbstractTransactionBuilder.java +++ b/ckb/src/main/java/org/nervos/ckb/transaction/AbstractTransactionBuilder.java @@ -18,6 +18,7 @@ public abstract class AbstractTransactionBuilder { * * @param configuration This is the bundle of configuration for builder, * such as fee rate and registerred {@link org.nervos.ckb.transaction.handler.ScriptHandler}. + * @param availableInputs The available inputs for the transaction. */ public AbstractTransactionBuilder(TransactionBuilderConfiguration configuration, Iterator availableInputs) { this.configuration = configuration; @@ -101,6 +102,7 @@ protected static long calculateTxFee(Transaction transaction, long feeRate) { * default context null. Use {@link #build(Object...)} to pass custom contexts. * * @see org.nervos.ckb.transaction.handler.ScriptHandler#buildTransaction(AbstractTransactionBuilder, ScriptGroup, Object) + * @return The built transaction with script groups. */ public TransactionWithScriptGroups build() { return build((Object) null); @@ -149,6 +151,8 @@ public Map rebuildScriptGroups(Map scr * The contexts will be passed to the registered script handlers in the same order. * * @see org.nervos.ckb.transaction.handler.ScriptHandler#buildTransaction(AbstractTransactionBuilder, ScriptGroup, Object) + * @param contexts The custom contexts for script handlers. + * @return The built transaction with script groups. */ abstract TransactionWithScriptGroups build(Object... contexts); } diff --git a/ckb/src/main/java/org/nervos/ckb/transaction/CkbTransactionBuilder.java b/ckb/src/main/java/org/nervos/ckb/transaction/CkbTransactionBuilder.java index 431c440a..fe773419 100644 --- a/ckb/src/main/java/org/nervos/ckb/transaction/CkbTransactionBuilder.java +++ b/ckb/src/main/java/org/nervos/ckb/transaction/CkbTransactionBuilder.java @@ -28,6 +28,8 @@ public CkbTransactionBuilder(TransactionBuilderConfiguration configuration, Iter * Add a potential input for the transaction. *

* The input may not be actually used if there's already enough capacity for the outputs. + * @param transactionInput The input. + * @return The builder. */ public CkbTransactionBuilder addInput(TransactionInput transactionInput) { transactionInputs.add(transactionInput); @@ -45,6 +47,9 @@ public CkbTransactionBuilder addHeaderDep(String headerDep) { /** * Add outputs and data. The two parameters should have the same size. + * @param outputs The outputs. + * @param outputsData The data of the outputs. + * @return The builder. */ public CkbTransactionBuilder setOutputs(List outputs, List outputsData) { tx.outputs.addAll(outputs); @@ -75,6 +80,9 @@ public CkbTransactionBuilder addDaoDepositOutput(String address, long capacity) * Set possible change output. Its capacity must be 0. *

* Change output should be set only once. + * @param output The change output. + * @param data The data of the change output. + * @return The builder. */ public CkbTransactionBuilder setChangeOutput(@Nonnull CellOutput output, @Nonnull byte[] data) { if (changeOutput != null) { @@ -92,6 +100,8 @@ public CkbTransactionBuilder setChangeOutput(@Nonnull CellOutput output, @Nonnul * Set possible change output address. *

* Change output should be set only once. + * @param address The address of the change output. + * @return The builder. */ public CkbTransactionBuilder setChangeOutput(@Nonnull String address) { CellOutput output = new CellOutput(0, Address.decode(address).getScript()); diff --git a/ckb/src/main/java/org/nervos/ckb/transaction/handler/ScriptHandler.java b/ckb/src/main/java/org/nervos/ckb/transaction/handler/ScriptHandler.java index f1035a81..95396a2b 100644 --- a/ckb/src/main/java/org/nervos/ckb/transaction/handler/ScriptHandler.java +++ b/ckb/src/main/java/org/nervos/ckb/transaction/handler/ScriptHandler.java @@ -29,8 +29,9 @@ public interface ScriptHandler { * *

For example:

* - * 
{@code
-   * @Override
+   * 
+   * 
+   * \@Override
    * boolean buildTransaction(AbstractTransactionBuilder txBuilder, ScriptGroup scriptGroup, Object context) {
    *    // Only change the transaction when the script is used.
    *    if (scriptGroup == null || !isMatched(scriptGroup.getScript())) {
@@ -45,8 +46,8 @@ public interface ScriptHandler {
    *    txBuilder.setWitness(witnessIndex, WitnessArgs.Type.LOCK, dummyWitness);
    *
    *    return true;
-   * }
-   * }

+   * 
+   *
* * @param txBuilder The transaction in building. * @param scriptGroup Transaction builder calls this callback for each script group found in the transaction. diff --git a/core/src/main/java/org/nervos/ckb/sign/ScriptSigner.java b/core/src/main/java/org/nervos/ckb/sign/ScriptSigner.java index c114b45b..c1f07925 100644 --- a/core/src/main/java/org/nervos/ckb/sign/ScriptSigner.java +++ b/core/src/main/java/org/nervos/ckb/sign/ScriptSigner.java @@ -20,9 +20,9 @@ public interface ScriptSigner { * @param context This is passed from {@code TransactionSigner.signTransaction} * @return {@code true} when the script handler has modified the transaction. * - * @see TransactionSigner#signTransaction(TransactionWithScriptGroups, Context...) - * @see TransactionSigner#signTransaction(TransactionWithScriptGroups, Set) - * @see TransactionSigner#signTransaction(TransactionWithScriptGroups, String...) + * @see "TransactionSigner#signTransaction(TransactionWithScriptGroups, Context...)" + * @see "TransactionSigner#signTransaction(TransactionWithScriptGroups, Set)" + * @see "TransactionSigner#signTransaction(TransactionWithScriptGroups, String...)" */ boolean signTransaction(Transaction transaction, ScriptGroup scriptGroup, Context context); } From cc5ed338574ac52b785b23d73d0d582802ff01ab Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 14:15:57 +0800 Subject: [PATCH 04/82] update --- .github/workflows/cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index df736f1b..521f113e 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -2,7 +2,7 @@ name: Continuous delivery in GitHub and Maven Central Repository on: push: - tags: + branch: - 'rc-test/v*' jobs: From fb33231c2ca5eb6770727dc79a586a6066348635 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 14:45:56 +0800 Subject: [PATCH 05/82] update --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 794c8037..71a13804 100644 --- a/build.gradle +++ b/build.gradle @@ -111,7 +111,7 @@ configure(subprojects.findAll { it.name != 'tests' }) { pom { name = 'ckb-sdk-java' - description = project.description + description = "ckb java sdk" url = 'https://github.com/nervosnetwork/ckb-sdk-java.git' scm { connection = 'scm:git@github.com:nervosnetwork/ckb-sdk-java.git' From d987f5ed68fdb4fca80d202779432d3e77eefc90 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 15:03:19 +0800 Subject: [PATCH 06/82] update --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 71a13804..a04434aa 100644 --- a/build.gradle +++ b/build.gradle @@ -26,6 +26,7 @@ buildscript { plugins { id 'com.github.johnrengelman.shadow' version '8.1.1' id 'java' + id 'signing' } apply plugin: 'com.github.johnrengelman.shadow' From 0a4e3689e951f666c980dd8038719deaa36f5cae Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 15:07:09 +0800 Subject: [PATCH 07/82] update --- .github/workflows/cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 521f113e..979c9d68 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -38,7 +38,7 @@ jobs: - name: Build project run: | chmod +x ./gradlew - ./gradlew shadowJar + ./gradlew build echo ls build && ls build echo tree build && tree build From a9cb38e5fb01fc2d2cdcd9aefbe7e4f10387367e Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 15:13:26 +0800 Subject: [PATCH 08/82] update --- build.gradle | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/build.gradle b/build.gradle index a04434aa..381b7b30 100644 --- a/build.gradle +++ b/build.gradle @@ -63,6 +63,29 @@ allprojects { apply from: rootProject.file('gradle/checkstyle.gradle') } + + // Must be BELOW subprojects{} + task alljavadoc(type: Javadoc) { + source subprojects.collect { it.sourceSets.main.allJava } + classpath = files(subprojects.collect { it.sourceSets.main.compileClasspath }) + destinationDir = file("${buildDir}/docs/javadoc") + } + + task javadocJar(type: Jar, dependsOn: alljavadoc) { + classifier = 'javadoc' + from alljavadoc.destinationDir + } + + task sourcesJar(type: Jar) { + classifier = 'sources' + from subprojects.collect { it.sourceSets.main.allSource } + } + + shadowJar.finalizedBy javadocJar + shadowJar.finalizedBy sourcesJar + + + configure(subprojects.findAll { it.name != 'tests' }) { // Required for Maven Nexus repository apply plugin: 'signing' From 57c3bba0a71bc4768c4041f9c08979a5b85146da Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 16:01:29 +0800 Subject: [PATCH 09/82] update --- build.gradle | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/build.gradle b/build.gradle index 381b7b30..dbbf3386 100644 --- a/build.gradle +++ b/build.gradle @@ -63,29 +63,6 @@ allprojects { apply from: rootProject.file('gradle/checkstyle.gradle') } - - // Must be BELOW subprojects{} - task alljavadoc(type: Javadoc) { - source subprojects.collect { it.sourceSets.main.allJava } - classpath = files(subprojects.collect { it.sourceSets.main.compileClasspath }) - destinationDir = file("${buildDir}/docs/javadoc") - } - - task javadocJar(type: Jar, dependsOn: alljavadoc) { - classifier = 'javadoc' - from alljavadoc.destinationDir - } - - task sourcesJar(type: Jar) { - classifier = 'sources' - from subprojects.collect { it.sourceSets.main.allSource } - } - - shadowJar.finalizedBy javadocJar - shadowJar.finalizedBy sourcesJar - - - configure(subprojects.findAll { it.name != 'tests' }) { // Required for Maven Nexus repository apply plugin: 'signing' @@ -133,6 +110,9 @@ configure(subprojects.findAll { it.name != 'tests' }) { version '0.0.11' from components.java + artifact javadocJar + artifact sourcesJar + pom { name = 'ckb-sdk-java' description = "ckb java sdk" From 47a3730223a457e229238ad9824fff722483aee9 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 16:13:15 +0800 Subject: [PATCH 10/82] update --- build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.gradle b/build.gradle index dbbf3386..04a8ab61 100644 --- a/build.gradle +++ b/build.gradle @@ -149,7 +149,9 @@ configure(subprojects.findAll { it.name != 'tests' }) { signing { required { gradle.taskGraph.hasTask('uploadArchives') } // only execute as part of this task + println "start sign ${project.name} ${it.name}" sign configurations.archives + println "sign ${project.name} ${it.name} finish" } tasks.register('release') { From b3e57e355109ad5c74b312ee39467d0cc27a3fa0 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 16:16:24 +0800 Subject: [PATCH 11/82] update --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 04a8ab61..e0b2b7a7 100644 --- a/build.gradle +++ b/build.gradle @@ -149,9 +149,9 @@ configure(subprojects.findAll { it.name != 'tests' }) { signing { required { gradle.taskGraph.hasTask('uploadArchives') } // only execute as part of this task - println "start sign ${project.name} ${it.name}" + println "start sign" sign configurations.archives - println "sign ${project.name} ${it.name} finish" + println "sign finish" } tasks.register('release') { From e21473b2b4cf76f4c46117b17c3eedee8aa987f7 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 16:24:00 +0800 Subject: [PATCH 12/82] no sign Signed-off-by: Eval EXEC --- build.gradle | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index e0b2b7a7..e845b5b9 100644 --- a/build.gradle +++ b/build.gradle @@ -147,11 +147,12 @@ configure(subprojects.findAll { it.name != 'tests' }) { } signing { - required { gradle.taskGraph.hasTask('uploadArchives') } + sign publishing.publications.mavenJava + // required { gradle.taskGraph.hasTask('uploadArchives') } // only execute as part of this task - println "start sign" - sign configurations.archives - println "sign finish" + // println "start sign" + // sign configurations.archives + // println "sign finish" } tasks.register('release') { From f579c278bdfb17b713097510d22ba2d6cb360e5c Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 16:38:32 +0800 Subject: [PATCH 13/82] update --- build.gradle | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index e845b5b9..e1c2a319 100644 --- a/build.gradle +++ b/build.gradle @@ -146,14 +146,19 @@ configure(subprojects.findAll { it.name != 'tests' }) { dependsOn publish } - signing { - sign publishing.publications.mavenJava - // required { gradle.taskGraph.hasTask('uploadArchives') } - // only execute as part of this task - // println "start sign" - // sign configurations.archives - // println "sign finish" - } + signing { + def signingKeyId = findProperty("signingKeyId") + def signingKey = findProperty("signing.secretKeyRingFile") + def signingPassword = findProperty("signingPassword") + useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword) + + sign publishing.publications.mavenJava + // required { gradle.taskGraph.hasTask('uploadArchives') } + // only execute as part of this task + // println "start sign" + // sign configurations.archives + // println "sign finish" + } tasks.register('release') { println("release ${it.name}") From 365837fb1986a71c592c26de7ae710ba6d610058 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 16:39:15 +0800 Subject: [PATCH 14/82] update --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index e1c2a319..62b9581f 100644 --- a/build.gradle +++ b/build.gradle @@ -147,9 +147,9 @@ configure(subprojects.findAll { it.name != 'tests' }) { } signing { - def signingKeyId = findProperty("signingKeyId") + def signingKeyId = findProperty("signing.KeyId") def signingKey = findProperty("signing.secretKeyRingFile") - def signingPassword = findProperty("signingPassword") + def signingPassword = findProperty("signing.password") useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword) sign publishing.publications.mavenJava From 620072b79dde59421b5c657ddc19d4f4446835aa Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 16:43:21 +0800 Subject: [PATCH 15/82] update --- build.gradle | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 62b9581f..45138827 100644 --- a/build.gradle +++ b/build.gradle @@ -147,12 +147,19 @@ configure(subprojects.findAll { it.name != 'tests' }) { } signing { - def signingKeyId = findProperty("signing.KeyId") - def signingKey = findProperty("signing.secretKeyRingFile") - def signingPassword = findProperty("signing.password") - useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword) - sign publishing.publications.mavenJava + + def keyId = project.findProperty('signing.keyId') + def secretKeyRingFile = project.findProperty('signing.secretKeyRingFile') + def password = project.findProperty('signing.password') + + if (keyId != null && secretKeyRingFile != null && password != null) { + useInMemoryPgpKeys(keyId, secretKeyRingFile, password) + } else { + throw new GradleException("Signing configuration is incomplete or incorrect.") + } + + // required { gradle.taskGraph.hasTask('uploadArchives') } // only execute as part of this task // println "start sign" From 761af35b2e2a80b154062515c94311d5e96bc16f Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 16:50:32 +0800 Subject: [PATCH 16/82] update --- build.gradle | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/build.gradle b/build.gradle index 45138827..8645a83f 100644 --- a/build.gradle +++ b/build.gradle @@ -108,7 +108,10 @@ configure(subprojects.findAll { it.name != 'tests' }) { mavenJava(MavenPublication) { groupId 'org.nervos.ckb' version '0.0.11' - from components.java + from components.java + + beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } + artifact javadocJar artifact sourcesJar @@ -146,26 +149,11 @@ configure(subprojects.findAll { it.name != 'tests' }) { dependsOn publish } - signing { - sign publishing.publications.mavenJava - - def keyId = project.findProperty('signing.keyId') - def secretKeyRingFile = project.findProperty('signing.secretKeyRingFile') - def password = project.findProperty('signing.password') - - if (keyId != null && secretKeyRingFile != null && password != null) { - useInMemoryPgpKeys(keyId, secretKeyRingFile, password) - } else { - throw new GradleException("Signing configuration is incomplete or incorrect.") - } - - - // required { gradle.taskGraph.hasTask('uploadArchives') } - // only execute as part of this task - // println "start sign" - // sign configurations.archives - // println "sign finish" - } + signing { + required { gradle.taskGraph.hasTask('uploadArchives') } + // only execute as part of this task + sign configurations.archives + } tasks.register('release') { println("release ${it.name}") From 3adb02d6a55cf8e9e4092b905fe49e41eb2b415e Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 16:52:08 +0800 Subject: [PATCH 17/82] update --- build.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/build.gradle b/build.gradle index 8645a83f..0c2977a2 100644 --- a/build.gradle +++ b/build.gradle @@ -110,9 +110,6 @@ configure(subprojects.findAll { it.name != 'tests' }) { version '0.0.11' from components.java - beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } - - artifact javadocJar artifact sourcesJar From 787c226f15ba597208ad0768aced97e5efffb99b Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 16:56:33 +0800 Subject: [PATCH 18/82] update --- build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0c2977a2..cad27fc8 100644 --- a/build.gradle +++ b/build.gradle @@ -149,7 +149,9 @@ configure(subprojects.findAll { it.name != 'tests' }) { signing { required { gradle.taskGraph.hasTask('uploadArchives') } // only execute as part of this task - sign configurations.archives + // sign configurations.archives + sign publishing.publications.mavenJava + } tasks.register('release') { From e6b2f06f779ff62ae0bf6b15a7949a0f96c2c2b5 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 16:57:20 +0800 Subject: [PATCH 19/82] update --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index cad27fc8..73387898 100644 --- a/build.gradle +++ b/build.gradle @@ -150,7 +150,7 @@ configure(subprojects.findAll { it.name != 'tests' }) { required { gradle.taskGraph.hasTask('uploadArchives') } // only execute as part of this task // sign configurations.archives - sign publishing.publications.mavenJava + sign publishing.publications.mavenJava } From bd4af11cb20c0365d238e1f9a1e6896322efa14a Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 17:04:02 +0800 Subject: [PATCH 20/82] update --- build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 73387898..b13038f5 100644 --- a/build.gradle +++ b/build.gradle @@ -150,7 +150,10 @@ configure(subprojects.findAll { it.name != 'tests' }) { required { gradle.taskGraph.hasTask('uploadArchives') } // only execute as part of this task // sign configurations.archives - sign publishing.publications.mavenJava + // sign publishing.publications.mavenJava + sign publishing.publications.main + + } From 6a9084ac2ea217d6ccf9960363f06d45f386fda3 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 17:04:10 +0800 Subject: [PATCH 21/82] update --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b13038f5..9aeeb0ce 100644 --- a/build.gradle +++ b/build.gradle @@ -151,7 +151,7 @@ configure(subprojects.findAll { it.name != 'tests' }) { // only execute as part of this task // sign configurations.archives // sign publishing.publications.mavenJava - sign publishing.publications.main + sign publishing.publications.main From c84ebba3d456f7572e92c2b58a61ccb9bf90babc Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 17:06:29 +0800 Subject: [PATCH 22/82] update --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 9aeeb0ce..ece74215 100644 --- a/build.gradle +++ b/build.gradle @@ -149,9 +149,9 @@ configure(subprojects.findAll { it.name != 'tests' }) { signing { required { gradle.taskGraph.hasTask('uploadArchives') } // only execute as part of this task - // sign configurations.archives + sign configurations.archives // sign publishing.publications.mavenJava - sign publishing.publications.main + // sign publishing.publications.main From d1b8d9c2cf6935b9ffda9410b45207004131eda5 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 17:09:06 +0800 Subject: [PATCH 23/82] update --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index ece74215..f8858e1f 100644 --- a/build.gradle +++ b/build.gradle @@ -149,6 +149,7 @@ configure(subprojects.findAll { it.name != 'tests' }) { signing { required { gradle.taskGraph.hasTask('uploadArchives') } // only execute as part of this task + println "signing ${configurations.archives} " sign configurations.archives // sign publishing.publications.mavenJava // sign publishing.publications.main From 06e88cdf732d56aa9c0c061de87c6bb9049e4ee6 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 17:13:02 +0800 Subject: [PATCH 24/82] update --- build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index f8858e1f..b39c924f 100644 --- a/build.gradle +++ b/build.gradle @@ -64,8 +64,6 @@ allprojects { } configure(subprojects.findAll { it.name != 'tests' }) { - // Required for Maven Nexus repository - apply plugin: 'signing' // Required for JFrog Artifactory repository apply plugin: 'maven-publish' @@ -89,6 +87,9 @@ configure(subprojects.findAll { it.name != 'tests' }) { archives sourcesJar, javadocJar, testJar } + // Required for Maven Nexus repository + apply plugin: 'signing' + ext { ossrhUsername = project.hasProperty('ossrhUsername') ? project.property('ossrhUsername') : '' ossrhPassword = project.hasProperty('ossrhPassword') ? project.property('ossrhPassword') : '' From a747b903c8f4a474c50761b20dec18e223f26fac Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 17:15:38 +0800 Subject: [PATCH 25/82] update --- build.gradle | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index b39c924f..195c9aac 100644 --- a/build.gradle +++ b/build.gradle @@ -150,9 +150,8 @@ configure(subprojects.findAll { it.name != 'tests' }) { signing { required { gradle.taskGraph.hasTask('uploadArchives') } // only execute as part of this task - println "signing ${configurations.archives} " - sign configurations.archives - // sign publishing.publications.mavenJava + println "signing ${publishing.publications.mavenJava} " + sign publishing.publications.mavenJava // sign publishing.publications.main From 5acbe0932bb91d72f04b08a5bc1640d99484bae0 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 17:22:08 +0800 Subject: [PATCH 26/82] update --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 195c9aac..b24b17a5 100644 --- a/build.gradle +++ b/build.gradle @@ -148,7 +148,7 @@ configure(subprojects.findAll { it.name != 'tests' }) { } signing { - required { gradle.taskGraph.hasTask('uploadArchives') } + // required { gradle.taskGraph.hasTask('uploadArchives') } // only execute as part of this task println "signing ${publishing.publications.mavenJava} " sign publishing.publications.mavenJava From bda16fec5aa0c583a2aea3a1340ba5830612949c Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 17:26:46 +0800 Subject: [PATCH 27/82] update --- .github/workflows/cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 979c9d68..521f113e 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -38,7 +38,7 @@ jobs: - name: Build project run: | chmod +x ./gradlew - ./gradlew build + ./gradlew shadowJar echo ls build && ls build echo tree build && tree build From 4e4d8c9a9ee18c8ccd69dbab50009dc02063c583 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 17:30:15 +0800 Subject: [PATCH 28/82] update --- .github/workflows/cd.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 521f113e..18314918 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -50,7 +50,9 @@ jobs: ORG_GRADLE_PROJECT_signing.password: ${{ secrets.NEXUS_SIGNING_PASSWORD }} ORG_GRADLE_PROJECT_signing.secretKeyRingFile: ./secret_key.gpg run: | - ./gradlew uploadArchives + ./gradlew uploadArchives -PossrhUsername=${{ secrets.NEXUS_OSSRH_USERNAME }} -PossrhPassword=${{ secrets.NEXUS_OSSRH_PASSWORD }} -Psigning.keyId=${{ secrets.NEXUS_SIGNING_KEYID }} -Psigning.password=${{ secrets.NEXUS_SIGNING_PASSWORD }} -Psigning.secretKeyRingFile=./secret_key.gpg +# ./gradlew uploadArchives + # - name: upload artifact ckb.jar to GitHub release page # uses: actions/upload-release-asset@v1 # env: From 1888b104cd0fc6fc27c1338faf18d4a4b684e01e Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 17:41:13 +0800 Subject: [PATCH 29/82] update --- .github/workflows/cd.yml | 3 +-- build.gradle | 13 ++++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 18314918..3bd8e38f 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -50,8 +50,7 @@ jobs: ORG_GRADLE_PROJECT_signing.password: ${{ secrets.NEXUS_SIGNING_PASSWORD }} ORG_GRADLE_PROJECT_signing.secretKeyRingFile: ./secret_key.gpg run: | - ./gradlew uploadArchives -PossrhUsername=${{ secrets.NEXUS_OSSRH_USERNAME }} -PossrhPassword=${{ secrets.NEXUS_OSSRH_PASSWORD }} -Psigning.keyId=${{ secrets.NEXUS_SIGNING_KEYID }} -Psigning.password=${{ secrets.NEXUS_SIGNING_PASSWORD }} -Psigning.secretKeyRingFile=./secret_key.gpg -# ./gradlew uploadArchives + ./gradlew uploadArchives # - name: upload artifact ckb.jar to GitHub release page # uses: actions/upload-release-asset@v1 diff --git a/build.gradle b/build.gradle index b24b17a5..25cd2f67 100644 --- a/build.gradle +++ b/build.gradle @@ -148,14 +148,13 @@ configure(subprojects.findAll { it.name != 'tests' }) { } signing { - // required { gradle.taskGraph.hasTask('uploadArchives') } - // only execute as part of this task - println "signing ${publishing.publications.mavenJava} " - sign publishing.publications.mavenJava - // sign publishing.publications.main - - + signatory( + keyId: project.findProperty('signing.keyId'), + password: project.findProperty('signing.password'), + secretKeyRingFile: file(project.findProperty('signing.secretKeyRingFile')) + ) + sign publishing.publications.mavenJava } tasks.register('release') { From 7bc2805355387d095ddd3a75ab8182a881f6ed13 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 17:58:39 +0800 Subject: [PATCH 30/82] update --- .github/workflows/cd.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 3bd8e38f..198977fa 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -50,6 +50,8 @@ jobs: ORG_GRADLE_PROJECT_signing.password: ${{ secrets.NEXUS_SIGNING_PASSWORD }} ORG_GRADLE_PROJECT_signing.secretKeyRingFile: ./secret_key.gpg run: | + echo echo secret key gpg + file ./secret_key.gpg ./gradlew uploadArchives # - name: upload artifact ckb.jar to GitHub release page From 5e9c61298757acd33e4ea3cc8126afee56afd307 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 18:04:02 +0800 Subject: [PATCH 31/82] update --- .github/workflows/cd.yml | 2 -- build.gradle | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 198977fa..3bd8e38f 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -50,8 +50,6 @@ jobs: ORG_GRADLE_PROJECT_signing.password: ${{ secrets.NEXUS_SIGNING_PASSWORD }} ORG_GRADLE_PROJECT_signing.secretKeyRingFile: ./secret_key.gpg run: | - echo echo secret key gpg - file ./secret_key.gpg ./gradlew uploadArchives # - name: upload artifact ckb.jar to GitHub release page diff --git a/build.gradle b/build.gradle index 25cd2f67..b3929836 100644 --- a/build.gradle +++ b/build.gradle @@ -151,7 +151,7 @@ configure(subprojects.findAll { it.name != 'tests' }) { signatory( keyId: project.findProperty('signing.keyId'), password: project.findProperty('signing.password'), - secretKeyRingFile: file(project.findProperty('signing.secretKeyRingFile')) + secretKeyRingFile: project.findProperty('signing.secretKeyRingFile') ) sign publishing.publications.mavenJava From 713b3b2665204c3f0bedf06c622453c18804ea0c Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 18:07:22 +0800 Subject: [PATCH 32/82] update --- .github/workflows/cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 3bd8e38f..ef420460 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -48,7 +48,7 @@ jobs: ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.NEXUS_OSSRH_PASSWORD }} ORG_GRADLE_PROJECT_signing.keyId: ${{ secrets.NEXUS_SIGNING_KEYID }} ORG_GRADLE_PROJECT_signing.password: ${{ secrets.NEXUS_SIGNING_PASSWORD }} - ORG_GRADLE_PROJECT_signing.secretKeyRingFile: ./secret_key.gpg + ORG_GRADLE_PROJECT_signing.secretKeyRingFile: "./secret_key.gpg" run: | ./gradlew uploadArchives From f30fcdc4dc61abde589f5d913244992d24580398 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 18:08:39 +0800 Subject: [PATCH 33/82] update --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b3929836..095eddd5 100644 --- a/build.gradle +++ b/build.gradle @@ -150,8 +150,8 @@ configure(subprojects.findAll { it.name != 'tests' }) { signing { signatory( keyId: project.findProperty('signing.keyId'), - password: project.findProperty('signing.password'), secretKeyRingFile: project.findProperty('signing.secretKeyRingFile') + password: project.findProperty('signing.password'), ) sign publishing.publications.mavenJava From 710ffab68bcccb54b88b746bef359146cd70f45e Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 18:10:52 +0800 Subject: [PATCH 34/82] update --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 095eddd5..b3c1964c 100644 --- a/build.gradle +++ b/build.gradle @@ -150,8 +150,8 @@ configure(subprojects.findAll { it.name != 'tests' }) { signing { signatory( keyId: project.findProperty('signing.keyId'), - secretKeyRingFile: project.findProperty('signing.secretKeyRingFile') - password: project.findProperty('signing.password'), + secretKeyRingFile: project.findProperty('signing.secretKeyRingFile'), + password: project.findProperty('signing.password') ) sign publishing.publications.mavenJava From f98695b9bc8257d9c83671c2eb751c27fcec0e90 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 18:12:34 +0800 Subject: [PATCH 35/82] update --- build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.gradle b/build.gradle index b3c1964c..e05969f6 100644 --- a/build.gradle +++ b/build.gradle @@ -148,6 +148,9 @@ configure(subprojects.findAll { it.name != 'tests' }) { } signing { + + + signatory( keyId: project.findProperty('signing.keyId'), secretKeyRingFile: project.findProperty('signing.secretKeyRingFile'), From 541e26f8fe1cf0dfb6cca6644e1a3e0965f5804b Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 19:01:50 +0800 Subject: [PATCH 36/82] update --- build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index e05969f6..fe4a56b5 100644 --- a/build.gradle +++ b/build.gradle @@ -151,11 +151,12 @@ configure(subprojects.findAll { it.name != 'tests' }) { - signatory( + signatory{ keyId: project.findProperty('signing.keyId'), secretKeyRingFile: project.findProperty('signing.secretKeyRingFile'), password: project.findProperty('signing.password') - ) + } + sign publishing.publications.mavenJava } From 047e19a3062eb38fa2c671542f02363a12472b39 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 19:06:04 +0800 Subject: [PATCH 37/82] update --- build.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index fe4a56b5..e35541b2 100644 --- a/build.gradle +++ b/build.gradle @@ -151,11 +151,11 @@ configure(subprojects.findAll { it.name != 'tests' }) { - signatory{ - keyId: project.findProperty('signing.keyId'), - secretKeyRingFile: project.findProperty('signing.secretKeyRingFile'), - password: project.findProperty('signing.password') - } + // signatory{ + // keyId: project.findProperty('signing.keyId'), + // secretKeyRingFile: project.findProperty('signing.secretKeyRingFile'), + // password: project.findProperty('signing.password') + // } sign publishing.publications.mavenJava From 395f142dc52f187c9f5309411b6da1f4ee0fa173 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 19:09:38 +0800 Subject: [PATCH 38/82] update --- build.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index e35541b2..40f6a7da 100644 --- a/build.gradle +++ b/build.gradle @@ -151,11 +151,11 @@ configure(subprojects.findAll { it.name != 'tests' }) { - // signatory{ - // keyId: project.findProperty('signing.keyId'), - // secretKeyRingFile: project.findProperty('signing.secretKeyRingFile'), - // password: project.findProperty('signing.password') - // } + signatory{ + keyId: project.findProperty('signing.keyId'), + // secretKeyRingFile: project.findProperty('signing.secretKeyRingFile'), + password: project.findProperty('signing.password') + } sign publishing.publications.mavenJava From 8ab0f8c55d58276917a0488ee1ab06d8abf1f4ae Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 19:10:02 +0800 Subject: [PATCH 39/82] update --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 40f6a7da..15da67a4 100644 --- a/build.gradle +++ b/build.gradle @@ -151,11 +151,11 @@ configure(subprojects.findAll { it.name != 'tests' }) { - signatory{ + signatory( keyId: project.findProperty('signing.keyId'), // secretKeyRingFile: project.findProperty('signing.secretKeyRingFile'), password: project.findProperty('signing.password') - } + ) sign publishing.publications.mavenJava From 6d6262e4496a3bbc507f1b31e4cde95b320915c6 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 19:14:17 +0800 Subject: [PATCH 40/82] update --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 15da67a4..9d3213fe 100644 --- a/build.gradle +++ b/build.gradle @@ -153,8 +153,8 @@ configure(subprojects.findAll { it.name != 'tests' }) { signatory( keyId: project.findProperty('signing.keyId'), + // password: project.findProperty('signing.password') // secretKeyRingFile: project.findProperty('signing.secretKeyRingFile'), - password: project.findProperty('signing.password') ) From 70cbcf67f82415ec749e32f1104718a0b0baac3d Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 19:30:31 +0800 Subject: [PATCH 41/82] update --- build.gradle | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/build.gradle b/build.gradle index 9d3213fe..e14e4134 100644 --- a/build.gradle +++ b/build.gradle @@ -148,16 +148,6 @@ configure(subprojects.findAll { it.name != 'tests' }) { } signing { - - - - signatory( - keyId: project.findProperty('signing.keyId'), - // password: project.findProperty('signing.password') - // secretKeyRingFile: project.findProperty('signing.secretKeyRingFile'), - ) - - sign publishing.publications.mavenJava } From c8f9da2c0df676992d5e16b3ace9081a434fe8e9 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 19:32:26 +0800 Subject: [PATCH 42/82] update --- build.gradle | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index e14e4134..e91df81e 100644 --- a/build.gradle +++ b/build.gradle @@ -61,6 +61,11 @@ allprojects { useJUnitPlatform() } apply from: rootProject.file('gradle/checkstyle.gradle') + + + signing { + sign publishing.publications.mavenJava + } } configure(subprojects.findAll { it.name != 'tests' }) { @@ -147,9 +152,6 @@ configure(subprojects.findAll { it.name != 'tests' }) { dependsOn publish } - signing { - sign publishing.publications.mavenJava - } tasks.register('release') { println("release ${it.name}") From 930aaea9d51a62ae554b5ff7b65091cd1e743850 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 19:33:04 +0800 Subject: [PATCH 43/82] update --- build.gradle | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index e91df81e..58c0ad86 100644 --- a/build.gradle +++ b/build.gradle @@ -62,10 +62,6 @@ allprojects { } apply from: rootProject.file('gradle/checkstyle.gradle') - - signing { - sign publishing.publications.mavenJava - } } configure(subprojects.findAll { it.name != 'tests' }) { @@ -100,6 +96,11 @@ configure(subprojects.findAll { it.name != 'tests' }) { ossrhPassword = project.hasProperty('ossrhPassword') ? project.property('ossrhPassword') : '' } + + signing { + sign publishing.publications.mavenJava + } + publishing { repositories { maven { From 13c35ee8e85941b971fed357d732a8e6c53b352c Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 19:34:36 +0800 Subject: [PATCH 44/82] update --- build.gradle | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 58c0ad86..11e4e2f9 100644 --- a/build.gradle +++ b/build.gradle @@ -97,10 +97,6 @@ configure(subprojects.findAll { it.name != 'tests' }) { } - signing { - sign publishing.publications.mavenJava - } - publishing { repositories { maven { @@ -143,8 +139,13 @@ configure(subprojects.findAll { it.name != 'tests' }) { } } } - } - } + } + } + + signing { + sign publishing.publications.mavenJava + } + } From 07cebde6f24547799807f8f6628f037ed323176d Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 19:38:30 +0800 Subject: [PATCH 45/82] update --- build.gradle | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 11e4e2f9..90f8801b 100644 --- a/build.gradle +++ b/build.gradle @@ -94,6 +94,9 @@ configure(subprojects.findAll { it.name != 'tests' }) { ext { ossrhUsername = project.hasProperty('ossrhUsername') ? project.property('ossrhUsername') : '' ossrhPassword = project.hasProperty('ossrhPassword') ? project.property('ossrhPassword') : '' + // signing_keyId = project.hasProperty('signing.keyId') ? project.property('signing.keyId') : '' + // signing_password = project.hasProperty('signing.password') ? project.property('signing.password') : '' + // signing_secretKeyRingFile = project.hasProperty('signing.secretKeyRingFile') ? project.property('signing.secretKeyRingFile') : '' } @@ -141,12 +144,11 @@ configure(subprojects.findAll { it.name != 'tests' }) { } } } + } - signing { - sign publishing.publications.mavenJava - } - - } + signing { + sign publishing.publications.mavenJava + } tasks.register('uploadArchives') { From 70f0576638dc50dd98361ed3a8ba0f72f2f91b6a Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 19:40:06 +0800 Subject: [PATCH 46/82] update --- build.gradle | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 90f8801b..d5b0cf60 100644 --- a/build.gradle +++ b/build.gradle @@ -94,9 +94,9 @@ configure(subprojects.findAll { it.name != 'tests' }) { ext { ossrhUsername = project.hasProperty('ossrhUsername') ? project.property('ossrhUsername') : '' ossrhPassword = project.hasProperty('ossrhPassword') ? project.property('ossrhPassword') : '' - // signing_keyId = project.hasProperty('signing.keyId') ? project.property('signing.keyId') : '' - // signing_password = project.hasProperty('signing.password') ? project.property('signing.password') : '' - // signing_secretKeyRingFile = project.hasProperty('signing.secretKeyRingFile') ? project.property('signing.secretKeyRingFile') : '' + signing_keyId = project.hasProperty('signing.keyId') ? project.property('signing.keyId') : '' + signing_password = project.hasProperty('signing.password') ? project.property('signing.password') : '' + signing_secretKeyRingFile = project.hasProperty('signing.secretKeyRingFile') ? project.property('signing.secretKeyRingFile') : '' } @@ -148,6 +148,12 @@ configure(subprojects.findAll { it.name != 'tests' }) { signing { sign publishing.publications.mavenJava + signatory( + keyId: signing_keyId, + password: signing_password, + secretKeyRingFile: signing_secretKeyRingFile + ) + } From b7eb9afa50414a8d1b98c9dc440b1c330980a9fe Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 19:41:53 +0800 Subject: [PATCH 47/82] update --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index d5b0cf60..133dcc07 100644 --- a/build.gradle +++ b/build.gradle @@ -149,9 +149,9 @@ configure(subprojects.findAll { it.name != 'tests' }) { signing { sign publishing.publications.mavenJava signatory( - keyId: signing_keyId, - password: signing_password, - secretKeyRingFile: signing_secretKeyRingFile + keyId= signing_keyId, + password= signing_password, + secretKeyRingFile=signing_secretKeyRingFile ) } From c9ad458851d39daca18800f6fdd2110e3dba93c5 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 19:43:56 +0800 Subject: [PATCH 48/82] update --- build.gradle | 6 ------ 1 file changed, 6 deletions(-) diff --git a/build.gradle b/build.gradle index 133dcc07..fb8c0526 100644 --- a/build.gradle +++ b/build.gradle @@ -148,12 +148,6 @@ configure(subprojects.findAll { it.name != 'tests' }) { signing { sign publishing.publications.mavenJava - signatory( - keyId= signing_keyId, - password= signing_password, - secretKeyRingFile=signing_secretKeyRingFile - ) - } From 8caa0eb96d6bc64aabeecdbf12d7c364a63454c2 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 19:44:18 +0800 Subject: [PATCH 49/82] update --- build.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/build.gradle b/build.gradle index fb8c0526..baf3eb08 100644 --- a/build.gradle +++ b/build.gradle @@ -94,9 +94,6 @@ configure(subprojects.findAll { it.name != 'tests' }) { ext { ossrhUsername = project.hasProperty('ossrhUsername') ? project.property('ossrhUsername') : '' ossrhPassword = project.hasProperty('ossrhPassword') ? project.property('ossrhPassword') : '' - signing_keyId = project.hasProperty('signing.keyId') ? project.property('signing.keyId') : '' - signing_password = project.hasProperty('signing.password') ? project.property('signing.password') : '' - signing_secretKeyRingFile = project.hasProperty('signing.secretKeyRingFile') ? project.property('signing.secretKeyRingFile') : '' } From 66e04987bc4c414d0f2abb96e593dc116aef8414 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 19:48:55 +0800 Subject: [PATCH 50/82] update --- build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build.gradle b/build.gradle index baf3eb08..1a304795 100644 --- a/build.gradle +++ b/build.gradle @@ -144,6 +144,11 @@ configure(subprojects.findAll { it.name != 'tests' }) { } signing { + useInMemoryPgpKeys( + project.property("signing.keyId") as String, + file(project.property("signing.secretKeyRingFile") as String).readText(), + project.property("signing.password") as String + ) sign publishing.publications.mavenJava } From 89f54cf5bc252b2f94ac8d040ebd5354e7e7bc96 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 19:51:14 +0800 Subject: [PATCH 51/82] update --- .github/workflows/cd.yml | 6 +++--- build.gradle | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index ef420460..7d7198a9 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -46,9 +46,9 @@ jobs: env: ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.NEXUS_OSSRH_USERNAME }} ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.NEXUS_OSSRH_PASSWORD }} - ORG_GRADLE_PROJECT_signing.keyId: ${{ secrets.NEXUS_SIGNING_KEYID }} - ORG_GRADLE_PROJECT_signing.password: ${{ secrets.NEXUS_SIGNING_PASSWORD }} - ORG_GRADLE_PROJECT_signing.secretKeyRingFile: "./secret_key.gpg" + ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.NEXUS_SIGNING_KEYID }} + ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.NEXUS_SIGNING_PASSWORD }} + ORG_GRADLE_PROJECT_signingSecretKeyRingFile: "./secret_key.gpg" run: | ./gradlew uploadArchives diff --git a/build.gradle b/build.gradle index 1a304795..9d766834 100644 --- a/build.gradle +++ b/build.gradle @@ -145,9 +145,9 @@ configure(subprojects.findAll { it.name != 'tests' }) { signing { useInMemoryPgpKeys( - project.property("signing.keyId") as String, - file(project.property("signing.secretKeyRingFile") as String).readText(), - project.property("signing.password") as String + project.property("signingkeyId") as String, + file(project.property("signingSecretKeyRingFile") as String).readText(), + project.property("signingPassword") as String ) sign publishing.publications.mavenJava } From 549a04cb21e3f9bf5892516f9bd25fe6f8f94baf Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 20:08:18 +0800 Subject: [PATCH 52/82] update --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9d766834..f2c30403 100644 --- a/build.gradle +++ b/build.gradle @@ -145,7 +145,7 @@ configure(subprojects.findAll { it.name != 'tests' }) { signing { useInMemoryPgpKeys( - project.property("signingkeyId") as String, + project.property("signingKeyId") as String, file(project.property("signingSecretKeyRingFile") as String).readText(), project.property("signingPassword") as String ) From 2bd6f94a9f4e4e0957c176f2ffcdcc666781957b Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 20:11:55 +0800 Subject: [PATCH 53/82] update --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index f2c30403..a15f89e1 100644 --- a/build.gradle +++ b/build.gradle @@ -145,9 +145,9 @@ configure(subprojects.findAll { it.name != 'tests' }) { signing { useInMemoryPgpKeys( - project.property("signingKeyId") as String, - file(project.property("signingSecretKeyRingFile") as String).readText(), - project.property("signingPassword") as String + project.property('signingKeyId') as String, + file(project.property('signingSecretKeyRingFile') as String).readText(), + project.property('signingPassword') as String ) sign publishing.publications.mavenJava } From 797505b1281fae70d08e9e177404e9c68da972fb Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 20:15:22 +0800 Subject: [PATCH 54/82] update --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index a15f89e1..e8e647e9 100644 --- a/build.gradle +++ b/build.gradle @@ -145,9 +145,9 @@ configure(subprojects.findAll { it.name != 'tests' }) { signing { useInMemoryPgpKeys( - project.property('signingKeyId') as String, - file(project.property('signingSecretKeyRingFile') as String).readText(), - project.property('signingPassword') as String + project.property('ossrhUsername') as String, + file(project.property('ossrhUsername') as String).readText(), + project.property('ossrhUsername') as String ) sign publishing.publications.mavenJava } From 29c990e5002e74780a891973a7718ee08a4399dd Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 20:16:57 +0800 Subject: [PATCH 55/82] update --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e8e647e9..e0676451 100644 --- a/build.gradle +++ b/build.gradle @@ -146,7 +146,7 @@ configure(subprojects.findAll { it.name != 'tests' }) { signing { useInMemoryPgpKeys( project.property('ossrhUsername') as String, - file(project.property('ossrhUsername') as String).readText(), + file("./LICENSE").readText(), project.property('ossrhUsername') as String ) sign publishing.publications.mavenJava From b627386575647cc966e60ed85f411e05932e2a8c Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 20:18:37 +0800 Subject: [PATCH 56/82] update --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e0676451..3bf77a3f 100644 --- a/build.gradle +++ b/build.gradle @@ -146,7 +146,7 @@ configure(subprojects.findAll { it.name != 'tests' }) { signing { useInMemoryPgpKeys( project.property('ossrhUsername') as String, - file("./LICENSE").readText(), + file("./LICENSE").getText(), project.property('ossrhUsername') as String ) sign publishing.publications.mavenJava From 5c7ac89b3278e909ad76cb684f09deabeeab595e Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 20:20:39 +0800 Subject: [PATCH 57/82] update Signed-off-by: Eval EXEC --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3bf77a3f..5dd9786c 100644 --- a/build.gradle +++ b/build.gradle @@ -146,7 +146,7 @@ configure(subprojects.findAll { it.name != 'tests' }) { signing { useInMemoryPgpKeys( project.property('ossrhUsername') as String, - file("./LICENSE").getText(), + file("build.gradle").getText(), project.property('ossrhUsername') as String ) sign publishing.publications.mavenJava From a6e575fbe12c8b8aa2201f4858428495854b24e0 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 20:26:27 +0800 Subject: [PATCH 58/82] update --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5dd9786c..afae102d 100644 --- a/build.gradle +++ b/build.gradle @@ -146,7 +146,7 @@ configure(subprojects.findAll { it.name != 'tests' }) { signing { useInMemoryPgpKeys( project.property('ossrhUsername') as String, - file("build.gradle").getText(), + file(project.property('signingSecretKeyRingFile')).getText(), project.property('ossrhUsername') as String ) sign publishing.publications.mavenJava From ec77379d218209699b50fd97569b384b9766e327 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 20:33:13 +0800 Subject: [PATCH 59/82] update --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index afae102d..d533dfff 100644 --- a/build.gradle +++ b/build.gradle @@ -145,9 +145,9 @@ configure(subprojects.findAll { it.name != 'tests' }) { signing { useInMemoryPgpKeys( - project.property('ossrhUsername') as String, + project.property('signingKeyId') as String, file(project.property('signingSecretKeyRingFile')).getText(), - project.property('ossrhUsername') as String + project.property('signingPassword') as String ) sign publishing.publications.mavenJava } From 17a31c4ab19cc041f85b45da42af9cf0062ac662 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 20:36:17 +0800 Subject: [PATCH 60/82] update --- build.gradle | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index d533dfff..83d90228 100644 --- a/build.gradle +++ b/build.gradle @@ -94,6 +94,11 @@ configure(subprojects.findAll { it.name != 'tests' }) { ext { ossrhUsername = project.hasProperty('ossrhUsername') ? project.property('ossrhUsername') : '' ossrhPassword = project.hasProperty('ossrhPassword') ? project.property('ossrhPassword') : '' + signingKeyId = project.hasProperty('signingKeyId') ? project.property('signingKeyId') : '' + signingPassword = project.hasProperty('signingPassword') ? project.property('signingPassword') : '' + signingSecretKeyRingFile = project.hasProperty('signingSecretKeyRingFile') ? project.property('signingSecretKeyRingFile') : '' + + } @@ -145,9 +150,9 @@ configure(subprojects.findAll { it.name != 'tests' }) { signing { useInMemoryPgpKeys( - project.property('signingKeyId') as String, - file(project.property('signingSecretKeyRingFile')).getText(), - project.property('signingPassword') as String + signingKeyId + file(signingSecretKeyRingFile).getText(), + signingPassword as String ) sign publishing.publications.mavenJava } From 5656079ec4effe63d5950be1d6dc5a8ff9e5a7af Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 20:37:49 +0800 Subject: [PATCH 61/82] update --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 83d90228..93d95aad 100644 --- a/build.gradle +++ b/build.gradle @@ -96,7 +96,7 @@ configure(subprojects.findAll { it.name != 'tests' }) { ossrhPassword = project.hasProperty('ossrhPassword') ? project.property('ossrhPassword') : '' signingKeyId = project.hasProperty('signingKeyId') ? project.property('signingKeyId') : '' signingPassword = project.hasProperty('signingPassword') ? project.property('signingPassword') : '' - signingSecretKeyRingFile = project.hasProperty('signingSecretKeyRingFile') ? project.property('signingSecretKeyRingFile') : '' + signingSecretKeyRingFile = project.hasProperty('signingSecretKeyRingFile') ? project.property('signingSecretKeyRingFile') : 'signingSecretKeyRingFileMustExist' } From 95091d6844a18fc0d356c953b06d5100eca7c7e7 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 20:39:18 +0800 Subject: [PATCH 62/82] update --- .github/workflows/cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 7d7198a9..61f370bc 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -48,7 +48,7 @@ jobs: ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.NEXUS_OSSRH_PASSWORD }} ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.NEXUS_SIGNING_KEYID }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.NEXUS_SIGNING_PASSWORD }} - ORG_GRADLE_PROJECT_signingSecretKeyRingFile: "./secret_key.gpg" + ORG_GRADLE_PROJECT_signingSecretKeyRingFile: "/home/runner/work/ckb-sdk-java/ckb-sdk-java/secret_key.gpg" run: | ./gradlew uploadArchives From c78bcc34b4b38279c6e381fb1ac92bbbbfebdc14 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 20:44:45 +0800 Subject: [PATCH 63/82] update --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 93d95aad..7a3d219b 100644 --- a/build.gradle +++ b/build.gradle @@ -96,7 +96,7 @@ configure(subprojects.findAll { it.name != 'tests' }) { ossrhPassword = project.hasProperty('ossrhPassword') ? project.property('ossrhPassword') : '' signingKeyId = project.hasProperty('signingKeyId') ? project.property('signingKeyId') : '' signingPassword = project.hasProperty('signingPassword') ? project.property('signingPassword') : '' - signingSecretKeyRingFile = project.hasProperty('signingSecretKeyRingFile') ? project.property('signingSecretKeyRingFile') : 'signingSecretKeyRingFileMustExist' + signingSecretKeyRingFile = project.hasProperty('signingSecretKeyRingFile') ? project.property('signingSecretKeyRingFile') : System.getenv('ORG_GRADLE_PROJECT_signingSecretKeyRingFile') } From 865b7cf875d4a0a12874d8a2a42a018af7a450a2 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 20:49:57 +0800 Subject: [PATCH 64/82] update --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7a3d219b..d0b223ba 100644 --- a/build.gradle +++ b/build.gradle @@ -151,7 +151,7 @@ configure(subprojects.findAll { it.name != 'tests' }) { signing { useInMemoryPgpKeys( signingKeyId - file(signingSecretKeyRingFile).getText(), + file(signingKeyId).getText(), signingPassword as String ) sign publishing.publications.mavenJava From eb6f47cceef447f023b40d2883c1490759a6bc0b Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 20:52:13 +0800 Subject: [PATCH 65/82] update --- build.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index d0b223ba..704f9fc4 100644 --- a/build.gradle +++ b/build.gradle @@ -149,12 +149,12 @@ configure(subprojects.findAll { it.name != 'tests' }) { } signing { - useInMemoryPgpKeys( - signingKeyId - file(signingKeyId).getText(), - signingPassword as String - ) - sign publishing.publications.mavenJava + // useInMemoryPgpKeys( + // signingKeyId + // file(signingKeyId).getText(), + // signingPassword as String + // ) + // sign publishing.publications.mavenJava } From 429cacf52eb6299f8c2baa3787b4d5381ebfc772 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 20:55:55 +0800 Subject: [PATCH 66/82] update --- .github/workflows/cd.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 61f370bc..af14fb4f 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -39,13 +39,11 @@ jobs: run: | chmod +x ./gradlew ./gradlew shadowJar - echo ls build && ls build - echo tree build && tree build - name: Upload artifact to Nexus env: - ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.NEXUS_OSSRH_USERNAME }} - ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.NEXUS_OSSRH_PASSWORD }} + # ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.NEXUS_OSSRH_USERNAME }} + # ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.NEXUS_OSSRH_PASSWORD }} ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.NEXUS_SIGNING_KEYID }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.NEXUS_SIGNING_PASSWORD }} ORG_GRADLE_PROJECT_signingSecretKeyRingFile: "/home/runner/work/ckb-sdk-java/ckb-sdk-java/secret_key.gpg" From 99ec6eec768ac3cfdf6ab6b14e51baa11f22cad8 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 21:22:08 +0800 Subject: [PATCH 67/82] update --- .github/workflows/cd.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index af14fb4f..31d54182 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -40,13 +40,14 @@ jobs: chmod +x ./gradlew ./gradlew shadowJar + - uses: valeriangalliat/action-sshd-cloudflared@v3 - name: Upload artifact to Nexus env: - # ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.NEXUS_OSSRH_USERNAME }} - # ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.NEXUS_OSSRH_PASSWORD }} + ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.NEXUS_OSSRH_USERNAME }} + ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.NEXUS_OSSRH_PASSWORD }} ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.NEXUS_SIGNING_KEYID }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.NEXUS_SIGNING_PASSWORD }} - ORG_GRADLE_PROJECT_signingSecretKeyRingFile: "/home/runner/work/ckb-sdk-java/ckb-sdk-java/secret_key.gpg" + ORG_GRADLE_PROJECT_signingSecretKeyRingFile: "./secret_key.gpg" run: | ./gradlew uploadArchives From 3b3d9c709522a40ae73645085e074be24cd8dbc4 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 21:34:13 +0800 Subject: [PATCH 68/82] update --- .github/workflows/cd.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 31d54182..167782dc 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -40,7 +40,6 @@ jobs: chmod +x ./gradlew ./gradlew shadowJar - - uses: valeriangalliat/action-sshd-cloudflared@v3 - name: Upload artifact to Nexus env: ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.NEXUS_OSSRH_USERNAME }} From 1375e986abbdaafd2dbf497b3c796e29781aad2d Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 21:36:01 +0800 Subject: [PATCH 69/82] update --- .github/workflows/cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 167782dc..8338bcc4 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -48,7 +48,7 @@ jobs: ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.NEXUS_SIGNING_PASSWORD }} ORG_GRADLE_PROJECT_signingSecretKeyRingFile: "./secret_key.gpg" run: | - ./gradlew uploadArchives + [ -n "$ORG_GRADLE_PROJECT_signingKeyId" ] && ./gradlew uploadArchives # - name: upload artifact ckb.jar to GitHub release page # uses: actions/upload-release-asset@v1 From 9f43c349b39daf5d0c16746ed305e89a592faeba Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 21:38:06 +0800 Subject: [PATCH 70/82] update --- .github/workflows/cd.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 8338bcc4..8d466e06 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -48,7 +48,10 @@ jobs: ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.NEXUS_SIGNING_PASSWORD }} ORG_GRADLE_PROJECT_signingSecretKeyRingFile: "./secret_key.gpg" run: | - [ -n "$ORG_GRADLE_PROJECT_signingKeyId" ] && ./gradlew uploadArchives + [ -n "$ORG_GRADLE_PROJECT_signingKeyId" ] && \ + [ -n "$ORG_GRADLE_PROJECT_signingPassword" ] && \ + [ -n "$ORG_GRADLE_PROJECT_signingSecretKeyRingFile" ] && \ + ./gradlew uploadArchives # - name: upload artifact ckb.jar to GitHub release page # uses: actions/upload-release-asset@v1 From ceb7b5ed2ba929bda9e63e73409eb49ca458c94c Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 21:39:50 +0800 Subject: [PATCH 71/82] update --- .github/workflows/cd.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 8d466e06..9a3b5e18 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -47,10 +47,12 @@ jobs: ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.NEXUS_SIGNING_KEYID }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.NEXUS_SIGNING_PASSWORD }} ORG_GRADLE_PROJECT_signingSecretKeyRingFile: "./secret_key.gpg" + ORG_GRADLE_PROJECT_signingSecretKeyRingBase64: ${{ secrets.NEXUS_SIGNING_SECRET_KEY_BASE64 }} run: | [ -n "$ORG_GRADLE_PROJECT_signingKeyId" ] && \ [ -n "$ORG_GRADLE_PROJECT_signingPassword" ] && \ [ -n "$ORG_GRADLE_PROJECT_signingSecretKeyRingFile" ] && \ + [ -n "$ORG_GRADLE_PROJECT_signingSecretKeyRingBase64" ] && \ ./gradlew uploadArchives # - name: upload artifact ckb.jar to GitHub release page From 73696075ec5f027812f38a271826856ccda822bc Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 21:43:07 +0800 Subject: [PATCH 72/82] update --- .github/workflows/cd.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 9a3b5e18..240c7943 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -34,7 +34,7 @@ jobs: with: java-version: 1.8 - name: Prepare signing secret key ring file - run: echo "${{ secrets.NEXUS_SIGNING_SECRET_KEY_BASE64 }}" | base64 --decode > ./secret_key.gpg + run: echo "${{ secrets.NEXUS_SIGNING_SECRET_KEY_BASE64 }}" | base64 --decode > /tmp/secret_key.gpg - name: Build project run: | chmod +x ./gradlew @@ -46,13 +46,8 @@ jobs: ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.NEXUS_OSSRH_PASSWORD }} ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.NEXUS_SIGNING_KEYID }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.NEXUS_SIGNING_PASSWORD }} - ORG_GRADLE_PROJECT_signingSecretKeyRingFile: "./secret_key.gpg" - ORG_GRADLE_PROJECT_signingSecretKeyRingBase64: ${{ secrets.NEXUS_SIGNING_SECRET_KEY_BASE64 }} + ORG_GRADLE_PROJECT_signingSecretKeyRingFile: "/tmp/secret_key.gpg" run: | - [ -n "$ORG_GRADLE_PROJECT_signingKeyId" ] && \ - [ -n "$ORG_GRADLE_PROJECT_signingPassword" ] && \ - [ -n "$ORG_GRADLE_PROJECT_signingSecretKeyRingFile" ] && \ - [ -n "$ORG_GRADLE_PROJECT_signingSecretKeyRingBase64" ] && \ ./gradlew uploadArchives # - name: upload artifact ckb.jar to GitHub release page From 453c94d0b349d708a1531c0ced971105213ecbb5 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 21:45:55 +0800 Subject: [PATCH 73/82] update --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 704f9fc4..f0d296f3 100644 --- a/build.gradle +++ b/build.gradle @@ -154,7 +154,7 @@ configure(subprojects.findAll { it.name != 'tests' }) { // file(signingKeyId).getText(), // signingPassword as String // ) - // sign publishing.publications.mavenJava + sign publishing.publications.mavenJava } From dd701b08d5831f03d54a92719055651abcb98477 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 22:03:29 +0800 Subject: [PATCH 74/82] update --- .github/workflows/cd.yml | 6 +++--- build.gradle | 9 +++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 240c7943..c9912781 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -44,9 +44,9 @@ jobs: env: ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.NEXUS_OSSRH_USERNAME }} ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.NEXUS_OSSRH_PASSWORD }} - ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.NEXUS_SIGNING_KEYID }} - ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.NEXUS_SIGNING_PASSWORD }} - ORG_GRADLE_PROJECT_signingSecretKeyRingFile: "/tmp/secret_key.gpg" + ORG_GRADLE_PROJECT_signing.keyId: ${{ secrets.NEXUS_SIGNING_KEYID }} + ORG_GRADLE_PROJECT_signing.password: ${{ secrets.NEXUS_SIGNING_PASSWORD }} + ORG_GRADLE_PROJECT_signing.secretKeyRingFile: "/tmp/secret_key.gpg" run: | ./gradlew uploadArchives diff --git a/build.gradle b/build.gradle index f0d296f3..13ef282d 100644 --- a/build.gradle +++ b/build.gradle @@ -94,11 +94,6 @@ configure(subprojects.findAll { it.name != 'tests' }) { ext { ossrhUsername = project.hasProperty('ossrhUsername') ? project.property('ossrhUsername') : '' ossrhPassword = project.hasProperty('ossrhPassword') ? project.property('ossrhPassword') : '' - signingKeyId = project.hasProperty('signingKeyId') ? project.property('signingKeyId') : '' - signingPassword = project.hasProperty('signingPassword') ? project.property('signingPassword') : '' - signingSecretKeyRingFile = project.hasProperty('signingSecretKeyRingFile') ? project.property('signingSecretKeyRingFile') : System.getenv('ORG_GRADLE_PROJECT_signingSecretKeyRingFile') - - } @@ -154,7 +149,9 @@ configure(subprojects.findAll { it.name != 'tests' }) { // file(signingKeyId).getText(), // signingPassword as String // ) - sign publishing.publications.mavenJava + // sign publishing.publications.mavenJava + sign publishing.publications + } From 2d94b207fd1e5009b5bedab660784079f2cf66f9 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 22:08:49 +0800 Subject: [PATCH 75/82] update --- .github/workflows/cd.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index c9912781..90f794fa 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -44,9 +44,9 @@ jobs: env: ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.NEXUS_OSSRH_USERNAME }} ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.NEXUS_OSSRH_PASSWORD }} - ORG_GRADLE_PROJECT_signing.keyId: ${{ secrets.NEXUS_SIGNING_KEYID }} - ORG_GRADLE_PROJECT_signing.password: ${{ secrets.NEXUS_SIGNING_PASSWORD }} - ORG_GRADLE_PROJECT_signing.secretKeyRingFile: "/tmp/secret_key.gpg" + ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.NEXUS_SIGNING_KEYID }} + ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.NEXUS_SIGNING_PASSWORD }} + ORG_GRADLE_PROJECT_signingKey: "/tmp/secret_key.gpg" run: | ./gradlew uploadArchives From d08cdbca16be7c3f0684de1310432296bcf9bd67 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 22:10:50 +0800 Subject: [PATCH 76/82] update --- build.gradle | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 13ef282d..3f21f11c 100644 --- a/build.gradle +++ b/build.gradle @@ -150,7 +150,11 @@ configure(subprojects.findAll { it.name != 'tests' }) { // signingPassword as String // ) // sign publishing.publications.mavenJava - sign publishing.publications + def signingKeyId = findProperty("signingKeyId") + def signingKey = findProperty("signingKey") + def signingPassword = findProperty("signingPassword") + useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword) + sign publishing.publications } From a994eb9cac3a4bac3845fcf8d85c81654982e3db Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 22:23:02 +0800 Subject: [PATCH 77/82] update --- .github/workflows/cd.yml | 13 +++++++++---- build.gradle | 15 ++++----------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 90f794fa..ba3b625c 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -34,7 +34,12 @@ jobs: with: java-version: 1.8 - name: Prepare signing secret key ring file - run: echo "${{ secrets.NEXUS_SIGNING_SECRET_KEY_BASE64 }}" | base64 --decode > /tmp/secret_key.gpg + run: | + echo "${{ secrets.NEXUS_SIGNING_SECRET_KEY_BASE64 }}" | base64 --decode > /tmp/secret_key.gpg + printf "signing.keyId=%s\n" "${{ secrets.NEXUS_SIGNING_KEYID }}" >> gradle.properties + printf "signing.secretKeyRingFile=%s\n" /tmp/secret_key.gpg >> gradle.properties + printf "signing.password=%s\n" ${{ secrets.NEXUS_SIGNING_PASSWORD }} >> gradle.properties + - name: Build project run: | chmod +x ./gradlew @@ -44,9 +49,9 @@ jobs: env: ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.NEXUS_OSSRH_USERNAME }} ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.NEXUS_OSSRH_PASSWORD }} - ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.NEXUS_SIGNING_KEYID }} - ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.NEXUS_SIGNING_PASSWORD }} - ORG_GRADLE_PROJECT_signingKey: "/tmp/secret_key.gpg" + # ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.NEXUS_SIGNING_KEYID }} + # ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.NEXUS_SIGNING_PASSWORD }} + # ORG_GRADLE_PROJECT_signingKey: "/tmp/secret_key.gpg" run: | ./gradlew uploadArchives diff --git a/build.gradle b/build.gradle index 3f21f11c..278ce6f1 100644 --- a/build.gradle +++ b/build.gradle @@ -94,6 +94,10 @@ configure(subprojects.findAll { it.name != 'tests' }) { ext { ossrhUsername = project.hasProperty('ossrhUsername') ? project.property('ossrhUsername') : '' ossrhPassword = project.hasProperty('ossrhPassword') ? project.property('ossrhPassword') : '' + // signingKeyId + signingKeyId = project.hasProperty('signingKeyId') ? project.property('signingKeyId') : '' + signingPassword = project.hasProperty('signingPassword') ? project.property('signingPassword') : '' + signingKey = project.hasProperty('signingKey') ? project.property('signingKey') : '' } @@ -144,18 +148,7 @@ configure(subprojects.findAll { it.name != 'tests' }) { } signing { - // useInMemoryPgpKeys( - // signingKeyId - // file(signingKeyId).getText(), - // signingPassword as String - // ) - // sign publishing.publications.mavenJava - def signingKeyId = findProperty("signingKeyId") - def signingKey = findProperty("signingKey") - def signingPassword = findProperty("signingPassword") - useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword) sign publishing.publications - } From b174d6837707eaac39e25b67d46a6971468a51ce Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 22:28:30 +0800 Subject: [PATCH 78/82] update --- .github/workflows/cd.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index ba3b625c..0654b51d 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -36,9 +36,9 @@ jobs: - name: Prepare signing secret key ring file run: | echo "${{ secrets.NEXUS_SIGNING_SECRET_KEY_BASE64 }}" | base64 --decode > /tmp/secret_key.gpg - printf "signing.keyId=%s\n" "${{ secrets.NEXUS_SIGNING_KEYID }}" >> gradle.properties - printf "signing.secretKeyRingFile=%s\n" /tmp/secret_key.gpg >> gradle.properties - printf "signing.password=%s\n" ${{ secrets.NEXUS_SIGNING_PASSWORD }} >> gradle.properties + echo signing.keyId= ${{ secrets.NEXUS_SIGNING_KEYID }} >> gradle.properties + echo signing.secretKeyRingFile=/tmp/secret_key.gpg >> gradle.properties + echo signing.password=${{ secrets.NEXUS_SIGNING_PASSWORD }} >> gradle.properties - name: Build project run: | From 3219a334127ad77e1198729d7fbd6b52af652f4b Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 22:30:24 +0800 Subject: [PATCH 79/82] update --- .github/workflows/cd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 0654b51d..2745df8f 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -36,9 +36,9 @@ jobs: - name: Prepare signing secret key ring file run: | echo "${{ secrets.NEXUS_SIGNING_SECRET_KEY_BASE64 }}" | base64 --decode > /tmp/secret_key.gpg - echo signing.keyId= ${{ secrets.NEXUS_SIGNING_KEYID }} >> gradle.properties + # echo signing.keyId= ${{ secrets.NEXUS_SIGNING_KEYID }} >> gradle.properties echo signing.secretKeyRingFile=/tmp/secret_key.gpg >> gradle.properties - echo signing.password=${{ secrets.NEXUS_SIGNING_PASSWORD }} >> gradle.properties + # echo signing.password=${{ secrets.NEXUS_SIGNING_PASSWORD }} >> gradle.properties - name: Build project run: | From 30047ef7c0332075fe05924701e75b78d89d6715 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 22:31:57 +0800 Subject: [PATCH 80/82] update --- .github/workflows/cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 2745df8f..a82af474 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -38,7 +38,7 @@ jobs: echo "${{ secrets.NEXUS_SIGNING_SECRET_KEY_BASE64 }}" | base64 --decode > /tmp/secret_key.gpg # echo signing.keyId= ${{ secrets.NEXUS_SIGNING_KEYID }} >> gradle.properties echo signing.secretKeyRingFile=/tmp/secret_key.gpg >> gradle.properties - # echo signing.password=${{ secrets.NEXUS_SIGNING_PASSWORD }} >> gradle.properties + echo signing.password=${{ secrets.NEXUS_SIGNING_PASSWORD }} >> gradle.properties - name: Build project run: | From 29e3717d7bd638183abadc5419720180a82a9c2a Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 22:38:38 +0800 Subject: [PATCH 81/82] update --- .github/workflows/cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index a82af474..929ef371 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -38,7 +38,7 @@ jobs: echo "${{ secrets.NEXUS_SIGNING_SECRET_KEY_BASE64 }}" | base64 --decode > /tmp/secret_key.gpg # echo signing.keyId= ${{ secrets.NEXUS_SIGNING_KEYID }} >> gradle.properties echo signing.secretKeyRingFile=/tmp/secret_key.gpg >> gradle.properties - echo signing.password=${{ secrets.NEXUS_SIGNING_PASSWORD }} >> gradle.properties + echo signing.password="${{ secrets.NEXUS_SIGNING_PASSWORD }}" >> gradle.properties - name: Build project run: | From 4880b0e79034b05bf522c5f04e8f5c641ebf0850 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Wed, 5 Feb 2025 22:40:18 +0800 Subject: [PATCH 82/82] update --- .github/workflows/cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 929ef371..5dfda1a3 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -36,7 +36,7 @@ jobs: - name: Prepare signing secret key ring file run: | echo "${{ secrets.NEXUS_SIGNING_SECRET_KEY_BASE64 }}" | base64 --decode > /tmp/secret_key.gpg - # echo signing.keyId= ${{ secrets.NEXUS_SIGNING_KEYID }} >> gradle.properties + echo signing.keyId="${{ secrets.NEXUS_SIGNING_KEYID }}" >> gradle.properties echo signing.secretKeyRingFile=/tmp/secret_key.gpg >> gradle.properties echo signing.password="${{ secrets.NEXUS_SIGNING_PASSWORD }}" >> gradle.properties