Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ jobs:
uses: gradle/gradle-build-action@v2

- name: Publish to local
run: ./gradlew publishToMavenLocal
run: ./gradlew publishToMavenLocal -PskipSigning

- name: Build azure functions sample
run: ./gradlew azureFunctionsPackage
Expand Down Expand Up @@ -170,7 +170,7 @@ jobs:
uses: gradle/gradle-build-action@v2

- name: Publish to local
run: ./gradlew publishToMavenLocal
run: ./gradlew publishToMavenLocal -PskipSigning

- name: Build azure functions sample
run: ./gradlew azureFunctionsPackage
Expand Down
8 changes: 4 additions & 4 deletions azurefunctions/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ publishing {
}
}

// TODO: manual signing temporarily disabled, in favor of 1ES signing utils
//signing {
// sign publishing.publications.mavenJava
//}
signing {
required = !project.hasProperty("skipSigning")
sign publishing.publications.mavenJava
}

java {
withSourcesJar()
Expand Down
5 changes: 5 additions & 0 deletions azuremanaged/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,11 @@ publishing {
}
}

signing {
required = !project.hasProperty("skipSigning")
sign publishing.publications.mavenJava
}

java {
withSourcesJar()
withJavadocJar()
Expand Down
8 changes: 4 additions & 4 deletions client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,10 @@ publishing {
}
}

// TODO: manual signing temporarily disabled, in favor of 1ES signing
//signing {
// sign publishing.publications.mavenJava
//}
signing {
required = !project.hasProperty("skipSigning")
sign publishing.publications.mavenJava
}

java {
withSourcesJar()
Expand Down
14 changes: 10 additions & 4 deletions eng/templates/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ jobs:
artifact: drop
sbomBuildDropPath: $(System.DefaultWorkingDirectory)
sbomPackageName: 'Durable Task / Durable Functions Java SBOM'

steps:
- checkout: self

Expand All @@ -25,9 +24,15 @@ jobs:
jdkArchitectureOption: 'x64'
publishJUnitResults: false
tasks: clean assemble
displayName: Assemble durabletask-client and durabletask-azure-functions
displayName: Assemble durabletask-client and durabletask-azure-functions and durabletask-azuremanaged

# the secring.gpg file is required to sign the artifacts, it's generated from GnuPG, and it's stored in the library of the durabletaskframework ADO
- task: DownloadSecureFile@1
name: gpgSecretFile
displayName: 'Download GPG secret file'
inputs:
secureFile: 'secring.gpg'

# TODO: add 1ES-level signing
- task: Gradle@3
inputs:
workingDirectory: ''
Expand All @@ -37,7 +42,8 @@ jobs:
jdkVersionOption: 1.11
jdkArchitectureOption: 'x64'
tasks: publish
displayName: Publish durabletask-client and durabletask-azure-functions
options: '-Psigning.keyId=$(gpgSignKey) -Psigning.password=$(gpgSignPassword) -Psigning.secretKeyRingFile=$(gpgSecretFile.secureFilePath)'
displayName: Publish durabletask-client and durabletask-azure-functions and durabletask-azuremanaged

- task: CopyFiles@2
displayName: 'Copy publish file to Artifact Staging Directory'
Expand Down
Loading