Skip to content

Commit fb9a37b

Browse files
committed
install curl
Signed-off-by: Adam Ratzman <[email protected]>
1 parent f1aa61a commit fb9a37b

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@ jobs:
1313
test_android_jvm_linux:
1414
runs-on: ubuntu-latest
1515
environment: testing
16-
container: mingc/android-build-box
1716
env:
1817
SPOTIFY_CLIENT_ID: ${{ secrets.SPOTIFY_CLIENT_ID }}
1918
SPOTIFY_CLIENT_SECRET: ${{ secrets.SPOTIFY_CLIENT_SECRET }}
2019
steps:
2120
- name: Check out repo
2221
uses: actions/checkout@v2
22+
- name: Install curl
23+
run: sudo apt-get install curl
2324
- name: Test secret
2425
run: echo "client id secret is $SPOTIFY_CLIENT_ID"
2526
- name: Test android

build.gradle.kts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -402,10 +402,13 @@ publishing {
402402
}
403403

404404
signing {
405-
if (project.hasProperty("signing.keyId")
406-
&& project.hasProperty("signing.password")
407-
&& project.hasProperty("signing.secretKeyRingFile")
405+
if (project.hasProperty("signing_key_id")
406+
&& project.hasProperty("signing_key_password")
408407
) {
408+
useInMemoryPgpKeys(
409+
project.property("signing_key_id") as? String,
410+
project.property("signing_key_password") as? String
411+
)
409412
sign(publishing.publications)
410413
}
411414
}
@@ -527,10 +530,8 @@ fun PublishingExtension.registerPublishing() {
527530
url = uri(if (version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl)
528531

529532
credentials {
530-
val nexusUsername: String? = System.getenv("nexus.username")
531-
?: if (project.extra.has("nexusUsername")) project.extra["nexusUsername"] as? String else null
532-
val nexusPassword: String? = System.getenv("nexus.password")
533-
?: if (project.extra.has("nexusPassword")) project.extra["nexusPassword"] as? String else null
533+
val nexusUsername: String? by project
534+
val nexusPassword: String? by project
534535
username = nexusUsername
535536
password = nexusPassword
536537
}

0 commit comments

Comments
 (0)