diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 6688373..03b198e 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -38,11 +38,13 @@ jobs: key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }} restore-keys: ${{ runner.os }}-gradle- - name: Android environment + if: matrix.os != 'windows-latest' shell: bash run: | echo "ANDROID_HOME=$ANDROID_HOME" >> $GITHUB_ENV echo "ANDROID_NDK_VERSION=21.4.7075529" >> $GITHUB_ENV - name: Cached Android NDK + if: matrix.os != 'windows-latest' uses: actions/cache@v2 with: path: ${{ format('{0}/ndk/{1}', env.ANDROID_HOME, env.ANDROID_NDK_VERSION) }} @@ -61,11 +63,6 @@ jobs: shell: bash run: | $ANDROID_HOME/tools/bin/sdkmanager "ndk;$ANDROID_NDK_VERSION" - - name: Setup Android - if: matrix.os == 'windows-latest' - shell: bash - run: | - $ANDROID_HOME\\tools\\bin\\sdkmanager.bat "ndk;$ANDROID_NDK_VERSION" - name: Set up JDK 11 uses: actions/setup-java@v1 with: @@ -96,27 +93,15 @@ jobs: script: ./gradlew connectedCheck - name: Publish Linux if: matrix.os == 'ubuntu-latest' - env: - BINTRAY_USER: ${{ secrets.bintray_user }} - BINTRAY_APIKEY: ${{ secrets.bintray_apikey }} shell: bash -# ./gradlew publishLinuxPublicationToBintrayRepository :jni:jvm:linux:publishJvmPublicationToBintrayRepository -PsnapshotNumber=${{ github.run_number }} -PgitRef=${{ github.ref }} run: ./gradlew publishLinuxPublicationToMavenLocal :jni:jvm:linux:publishJvmPublicationToMavenLocal -PsnapshotNumber=${{ github.run_number }} -PgitRef=${{ github.ref }} - name: Publish Windows if: matrix.os == 'windows-latest' - env: - BINTRAY_USER: ${{ secrets.bintray_user }} - BINTRAY_APIKEY: ${{ secrets.bintray_apikey }} shell: bash -# ./gradlew :jni:jvm:mingw:publishJvmPublicationToBintrayRepository -PsnapshotNumber=${{ github.run_number }} -PgitRef=${{ github.ref }} run: ./gradlew :jni:jvm:mingw:publishToMavenLocal -PsnapshotNumber=${{ github.run_number }} -PgitRef=${{ github.ref }} - name: Publish MacOS if: matrix.os == 'macOS-latest' - env: - BINTRAY_USER: ${{ secrets.bintray_user }} - BINTRAY_APIKEY: ${{ secrets.bintray_apikey }} shell: bash -# ./gradlew publish -PsnapshotNumber=${{ github.run_number }} -PgitRef=${{ github.ref }} run: ./gradlew publishToMavenLocal -PsnapshotNumber=${{ github.run_number }} -PgitRef=${{ github.ref }} - name: Copy artifact files run: | @@ -129,34 +114,4 @@ jobs: path: | maven-local !maven-local/**/maven-metadata-local.xml -# - name: Discard -# if: ${{ failure() || cancelled() }} -# env: -# BINTRAY_USER: ${{ secrets.bintray_user }} -# BINTRAY_APIKEY: ${{ secrets.bintray_apikey }} -# run: ./gradlew postBintrayDiscard -PsnapshotNumber=${{ github.run_number }} -PgitRef=${{ github.ref }} -# publish: -# name: Publish -# needs: upload -# runs-on: ubuntu-latest -# steps: -# - name: Check out -# uses: actions/checkout@v2 -# with: -# submodules: 'true' -# - name: Cached Gradle -# uses: actions/cache@v2 -# with: -# path: ~/.gradle -# key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }} -# restore-keys: ${{ runner.os }}-gradle- -# - name: Set up JDK 11 -# uses: actions/setup-java@v1 -# with: -# java-version: 11 -# - name: Publish -# env: -# BINTRAY_USER: ${{ secrets.bintray_user }} -# BINTRAY_APIKEY: ${{ secrets.bintray_apikey }} -# run: ./gradlew postBintrayPublish -PsnapshotNumber=${{ github.run_number }} -PgitRef=${{ github.ref }} diff --git a/build.gradle.kts b/build.gradle.kts index aa97eb9..9bfc24b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,7 +22,7 @@ buildscript { allprojects { group = "fr.acinq.secp256k1" - version = "0.6.1-SNAPSHOT" + version = "0.6.1" repositories { google()