Skip to content

Commit

Permalink
bump the library version to 0.1.3 and try again
Browse files Browse the repository at this point in the history
  • Loading branch information
stephengold committed Jul 3, 2024
1 parent 493ff48 commit c154fe9
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 74 deletions.
103 changes: 39 additions & 64 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,15 @@ jobs:
- uses: mattsb42/not-grep@master
with:
config-file: .github/not-grep.toml
- run: ./gradlew -Pflavor=Sp build install --console=plain

- name: deploy native libraries to a GitHub release
- run: ./gradlew -Pflavor=Sp build install --console=plain \
-Psigning.keyId='${{ secrets.SIGNING_KEY }}' \
-Psigning.password='${{ secrets.SIGNING_PASSWORD }}'
- run: ./gradlew -Pflavor=Sp release --console=plain \
-Psigning.keyId='${{ secrets.SIGNING_KEY }}' \
-Psigning.password='${{ secrets.SIGNING_PASSWORD }}' \
-PossrhPassword='${{ secrets.OSSRH_PASSWORD }}' \
-PossrhUsername='${{ secrets.OSSRH_USERNAME }}'
if: startsWith(github.ref, 'refs/tags/')
uses: marvinpinto/[email protected]
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
prerelease: false
files: |
dist/Linux64DebugSp_libjoltjni.so
dist/Linux64ReleaseSp_libjoltjni.so

Java11-MacOS:
if: contains(toJson(github.event.commits), '[ci skip] ') == false
Expand All @@ -40,19 +38,15 @@ jobs:
distribution: 'zulu'
java-version: 11
- uses: actions/checkout@v4
- run: ./gradlew -Ptarget=MacOSX64 run build install --console=plain

- name: deploy native libraries to a GitHub release
- run: ./gradlew -Ptarget=MacOSX64 run build install --console=plain \
-Psigning.keyId='${{ secrets.SIGNING_KEY }}' \
-Psigning.password='${{ secrets.SIGNING_PASSWORD }}'
- run: ./gradlew -Ptarget=MacOSX64 release --console=plain \
-Psigning.keyId='${{ secrets.SIGNING_KEY }}' \
-Psigning.password='${{ secrets.SIGNING_PASSWORD }}' \
-PossrhPassword='${{ secrets.OSSRH_PASSWORD }}' \
-PossrhUsername='${{ secrets.OSSRH_USERNAME }}'
if: startsWith(github.ref, 'refs/tags/')
uses: marvinpinto/[email protected]
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
prerelease: false
files: |
dist/MacOSX64DebugDp_libjoltjni.dylib
dist/MacOSX64DebugSp_libjoltjni.dylib
dist/MacOSX64ReleaseDp_libjoltjni.dylib
dist/MacOSX64ReleaseSp_libjoltjni.dylib

Java17-MacOS:
if: contains(toJson(github.event.commits), '[ci skip] ') == false
Expand All @@ -63,19 +57,15 @@ jobs:
distribution: 'zulu'
java-version: 17
- uses: actions/checkout@v4
- run: ./gradlew -Ptarget=MacOSX_ARM64 build install --console=plain

- name: deploy native libraries to a GitHub release
- run: ./gradlew -Ptarget=MacOSX_ARM64 build install --console=plain \
-Psigning.keyId='${{ secrets.SIGNING_KEY }}' \
-Psigning.password='${{ secrets.SIGNING_PASSWORD }}'
- run: ./gradlew -Ptarget=MacOSX_ARM64 release --console=plain \
-Psigning.keyId='${{ secrets.SIGNING_KEY }}' \
-Psigning.password='${{ secrets.SIGNING_PASSWORD }}' \
-PossrhPassword='${{ secrets.OSSRH_PASSWORD }}' \
-PossrhUsername='${{ secrets.OSSRH_USERNAME }}'
if: startsWith(github.ref, 'refs/tags/')
uses: marvinpinto/[email protected]
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
prerelease: false
files: |
dist/MacOSX64_ARM64DebugDp_libjoltjni.dylib
dist/MacOSX64_ARM64DebugSp_libjoltjni.dylib
dist/MacOSX64_ARM64ReleaseDp_libjoltjni.dylib
dist/MacOSX64_ARM64ReleaseSp_libjoltjni.dylib

Java21-Windows:
if: contains(toJson(github.event.commits), '[ci skip] ') == false
Expand All @@ -86,20 +76,17 @@ jobs:
distribution: 'zulu'
java-version: 21
- uses: actions/checkout@v4
- run: ./gradlew build install --console=plain
- run: ./gradlew build install --console=plain \
-Psigning.keyId='${{ secrets.SIGNING_KEY }}' \
-Psigning.password='${{ secrets.SIGNING_PASSWORD }}'
shell: bash

- name: deploy native libraries to a GitHub release
- run: ./gradlew release --console=plain \
-Psigning.keyId='${{ secrets.SIGNING_KEY }}' \
-Psigning.password='${{ secrets.SIGNING_PASSWORD }}' \
-PossrhPassword='${{ secrets.OSSRH_PASSWORD }}' \
-PossrhUsername='${{ secrets.OSSRH_USERNAME }}'
if: startsWith(github.ref, 'refs/tags/')
uses: marvinpinto/[email protected]
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
prerelease: false
files: |
dist/Windows64DebugDp_joltjni.dll
dist/Windows64DebugSp_joltjni.dll
dist/Windows64ReleaseDp_joltjni.dll
dist/Windows64ReleaseSp_joltjni.dll
shell: bash

Java22-Linux:
if: contains(toJson(github.event.commits), '[ci skip] ') == false
Expand All @@ -110,23 +97,11 @@ jobs:
distribution: 'zulu'
java-version: 22
- uses: actions/checkout@v4
- run: ./gradlew -Pflavor=Dp build install --console=plain

- name: stage artifacts to Sonatype OSSRH
if: startsWith(github.ref, 'refs/tags/')
run: ./gradlew -Pflavor=Sp release --console=plain \
-PossrhPassword='${{ secrets.OSSRH_PASSWORD }}' \
-PossrhUsername='${{ secrets.OSSRH_USERNAME }}' \
- run: ./gradlew -Pflavor=Dp build install --console=plain \
-Psigning.keyId='${{ secrets.SIGNING_KEY }}' \
-Psigning.password='${{ secrets.SIGNING_PASSWORD }}'

- name: deploy artifacts and native libraries to a GitHub release
if: startsWith(github.ref, 'refs/tags/')
uses: marvinpinto/[email protected]
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
prerelease: false
files: |
dist/joltjni-*
dist/Linux64DebugSp_libjoltjni.so
dist/Linux64ReleaseSp_libjoltjni.so
- run: ./gradlew -Pflavor=Dp release --console=plain \
-Psigning.keyId='${{ secrets.SIGNING_KEY }}' \
-Psigning.password='${{ secrets.SIGNING_PASSWORD }}' \
-PossrhPassword='${{ secrets.OSSRH_PASSWORD }}' \
-PossrhUsername='${{ secrets.OSSRH_USERNAME }}'
29 changes: 20 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ plugins {
ext {
group = 'com.github.stephengold'
artifact = 'joltjni'
version = '0.1.2'
version = '0.1.3'
baseName = "${artifact}-${version}" // for artifacts
websiteUrl = 'https://github.com/stephengold/jolt-jni'
}
Expand Down Expand Up @@ -162,15 +162,26 @@ model {
if (buildable) {
println 'Build ' + q + ' using ' + toolChain

project.tasks.register('copyToDist' + q, Copy) {
String replaceWith = targetPlatform.operatingSystem.name \
+ '/' + targetPlatform.architecture.name \
+ '/com/github/stephengold/$1'
project.tasks.register('nativesJar' + q, Jar) {
archiveBaseName = project.ext.baseName
archiveClassifier = 'natives-' + q
dependsOn "joltjni${q}SharedLibrary"
description "Creates a JAR of the ${q} native library."
from sharedLibraryFile
rename { String filename ->
return q + '_' + filename
}
into 'dist'
rename '(.+)', replaceWith
}
jar.dependsOn('copyToDist' + q)

Task njTask = project.tasks.named('nativesJar' + q, Jar).get()
project.artifacts {
archives njTask.archiveFile
}
project.publishing.publications.maven {
artifact njTask
}

} else {
//println 'Do not build ' + q // to debug this script
}
Expand Down Expand Up @@ -343,8 +354,8 @@ publishMavenPublicationToMavenLocal.doLast {
// which should be stored in ~/.gradle/gradle.properties

signing {
sign configurations.archives
sign publishing.publications.maven
sign configurations.archives // JARs
sign publishing.publications.maven // .module and .pom
}
tasks.withType(Sign) {
onlyIf { project.hasProperty('signing.keyId') }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,6 @@ JNIEXPORT void JNICALL Java_com_github_stephengold_joltjni_Jolt_unregisterTypes
*/
JNIEXPORT jstring JNICALL Java_com_github_stephengold_joltjni_Jolt_versionString
(JNIEnv *pEnv, jclass) {
jstring result = pEnv->NewStringUTF("0.1.2");
jstring result = pEnv->NewStringUTF("0.1.3");
return result;
}

0 comments on commit c154fe9

Please sign in to comment.