Skip to content

Commit a426bcc

Browse files
mbwhitejt-nti
mbwhite
authored and
jt-nti
committed
Add the GitHub Packages releases step
Signed-off-by: Matthew B White <[email protected]>
1 parent cad64f4 commit a426bcc

File tree

3 files changed

+23
-48
lines changed

3 files changed

+23
-48
lines changed

‎.github/workflows/build.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ jobs:
8888

8989
- name: Populate chaincode with latest java-version
9090
run: |
91-
./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/repository publishShimJarPublicationToFabricRepository
92-
./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/repository publishShimJarPublicationToFabricRepository
93-
./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/bare-gradle/repository publishShimJarPublicationToFabricRepository
94-
./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/bare-maven/repository publishShimJarPublicationToFabricRepository
95-
./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/wrapper-maven/repository publishShimJarPublicationToFabricRepository
91+
./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/repository publishShimPublicationToFabricRepository
92+
./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/repository publishShimPublicationToFabricRepository
93+
./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/bare-gradle/repository publishShimPublicationToFabricRepository
94+
./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/bare-maven/repository publishShimPublicationToFabricRepository
95+
./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/wrapper-maven/repository publishShimPublicationToFabricRepository
9696
9797
9898
- name: Ensure that the Peer/weft tools are available
@@ -132,12 +132,14 @@ jobs:
132132
- name: Push to registry
133133
run: |
134134
set -xev
135+
./gradlew -Psigning.key="${SIGNING_KEY}" -Psigning.password="${SIGNING_PASSWORD}" -PossrhUsername="${OSSRH_USER}" -PossrhPassword="${OSSRH_PASSWORD}" publishAllPublicationsToGithubPackagesRepository
135136
./gradlew -Psigning.key="${SIGNING_KEY}" -Psigning.password="${SIGNING_PASSWORD}" -PossrhUsername="${OSSRH_USER}" -PossrhPassword="${OSSRH_PASSWORD}" publishAllPublicationsToReleaseRepository
136137
env:
137138
SIGNING_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
138139
SIGNING_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
139140
OSSRH_USER: ${{ secrets.OSSRH_USERNAME }}
140141
OSSRH_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
142+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
141143

142144
publishdocker:
143145
runs-on: ubuntu-latest

‎fabric-chaincode-docker/Dockerfile‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@ RUN gradle \
4444
-x checkstyleTest \
4545
-x dependencyCheckAnalyze
4646

47-
# Installing all shim jar dependencies to maven local
48-
WORKDIR /root/chaincode-java/shim-src/fabric-chaincode-shim/build/publications/shimJar/
49-
RUN mvn -f pom-default.xml compile
50-
5147
WORKDIR /root/chaincode-java
5248
# Run the Gradle and Maven commands to generate the wrapper variants
5349
# of each tool

‎fabric-chaincode-shim/build.gradle‎

Lines changed: 16 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -290,64 +290,41 @@ publishing {
290290
}
291291
}
292292

293-
shimJar(MavenPublication) {
294-
from components.java
295-
artifactId 'fabric-chaincode-shim'
296-
pom.withXml {
297-
def repository = asNode()
298-
.appendNode('repositories')
299-
.appendNode('repository');
300-
repository.appendNode('id', 'jitpack.io')
301-
repository.appendNode('url', 'https://jitpack.io')
302-
}
303-
}
304293
}
305294

306295
repositories {
307296
maven {
308297
name = "release"
309-
if (nightly) {
310-
url = "https://hyperledger-fabric.jfrog.io/artifactory/fabric-maven"
311-
credentials {
312-
username = project.findProperty('artifactoryUsername')
313-
password = project.findProperty('artifactoryPassword')
314-
}
315-
} else {
316-
url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
317-
credentials {
318-
username = project.findProperty('ossrhUsername')
319-
password = project.findProperty('ossrhPassword')
320-
}
298+
url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
299+
credentials {
300+
username = project.findProperty('ossrhUsername')
301+
password = project.findProperty('ossrhPassword')
321302
}
303+
322304
}
323305

324306
maven {
325-
name = "snapshot"
326-
if (nightly) {
327-
url = "https://hyperledger-fabric.jfrog.io/artifactory/fabric-maven"
328-
credentials {
329-
username = project.findProperty('artifactoryUsername')
330-
password = project.findProperty('artifactoryPassword')
331-
}
332-
} else {
333-
url = "https://oss.sonatype.org/content/repositories/snapshots/"
334-
credentials {
335-
username = project.findProperty('ossrhUsername')
336-
password = project.findProperty('ossrhPassword')
337-
}
307+
name = "GitHubPackages"
308+
url = "https://maven.pkg.github.com/hyperledger/fabric-chaincode-java"
309+
credentials {
310+
username = System.getenv("GITHUB_ACTOR")
311+
password = System.getenv("GITHUB_TOKEN")
338312
}
339313
}
340314
}
341315
}
342316

343317
signing {
318+
println "Signing"
344319
if (project.findProperty('signing.key')) {
345-
def signingKey = findProperty("signing.key")
346-
def signingPassword = findProperty("signing.password")
320+
def signingKey = project.findProperty('signing.key')
321+
def signingPassword = project.findProperty('signing.password')
347322
useInMemoryPgpKeys(signingKey, signingPassword)
348323

349324
sign publishing.publications.shim
350-
sign publishing.publications.shimJar
325+
println "... signed"
326+
} else {
327+
println "... no keys to use "
351328
}
352329
}
353330

0 commit comments

Comments
 (0)