diff --git a/.github/workflows/build-branch.yml b/.github/workflows/build-branch.yml index 0e25345d..69e9a692 100644 --- a/.github/workflows/build-branch.yml +++ b/.github/workflows/build-branch.yml @@ -4,7 +4,6 @@ on: push: branches-ignore: - main - - dev - kotlin-eap/* jobs: diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml deleted file mode 100644 index 2ec89fe2..00000000 --- a/.github/workflows/build-dev.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: Build dev -on: - workflow_dispatch: - push: - branches: - - dev - -jobs: - checks: - uses: ./.github/workflows/run-checks.yml - - publish: - needs: [ checks ] - uses: ./.github/workflows/publish-snapshot.yml - secrets: inherit diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml index 6b5507d2..c8fb1d73 100644 --- a/.github/workflows/build-main.yml +++ b/.github/workflows/build-main.yml @@ -11,8 +11,5 @@ jobs: publish: needs: [ checks ] - uses: ./.github/workflows/publish-website.yml - permissions: - contents: read - pages: write - id-token: write + uses: ./.github/workflows/publish-snapshot.yml + secrets: inherit diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index e93f5223..724219ca 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -12,3 +12,11 @@ jobs: needs: [ checks ] uses: ./.github/workflows/publish-release.yml secrets: inherit + + publish-website: + needs: [ publish ] + uses: ./.github/workflows/publish-website.yml + permissions: + contents: read + pages: write + id-token: write diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml index 197e8efc..0c3dbab7 100644 --- a/.github/workflows/publish-snapshot.yml +++ b/.github/workflows/publish-snapshot.yml @@ -16,7 +16,7 @@ jobs: cache-disabled: true - name: Publish to Maven Local (prepare packages) - run: ./gradlew publishToMavenLocal --no-configuration-cache + run: ./gradlew publishToMavenLocal -Pversion=0.3.0-SNAPSHOT --no-configuration-cache env: ORG_GRADLE_PROJECT_signingKey: ${{secrets.signingKey}} ORG_GRADLE_PROJECT_signingPassword: ${{secrets.signingPassword}} @@ -24,7 +24,7 @@ jobs: ORG_GRADLE_PROJECT_sonatypePassword: ${{secrets.sonatypePassword}} - name: Publish snapshot to Sonatype - run: ./gradlew publishAllPublicationsToSnapshotRepository --no-configuration-cache + run: ./gradlew publishAllPublicationsToSnapshotRepository -Pversion=0.3.0-SNAPSHOT --no-configuration-cache env: ORG_GRADLE_PROJECT_signingKey: ${{secrets.signingKey}} ORG_GRADLE_PROJECT_signingPassword: ${{secrets.signingPassword}} diff --git a/.github/workflows/run-build-project.yml b/.github/workflows/run-build-project.yml index c798018d..d82815b3 100644 --- a/.github/workflows/run-build-project.yml +++ b/.github/workflows/run-build-project.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v4 - uses: ./.github/actions/setup-gradle with: - cache-read-only: ${{ github.ref_name != 'dev' }} + cache-read-only: ${{ github.ref_name != 'main' }} - if: matrix.os == 'windows-latest' uses: msys2/setup-msys2@v2 diff --git a/gradle.properties b/gradle.properties index d29a08da..a131cb44 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ # group=dev.whyoleg.cryptography -version=0.3.0-SNAPSHOT +version=0.3.0 #Kotlin kotlin.mpp.import.enableKgpDependencyResolution=true kotlin.mpp.enableCInteropCommonization=true