Skip to content

Commit

Permalink
Update workflows to use the main branch for development
Browse files Browse the repository at this point in the history
  • Loading branch information
whyoleg committed Feb 21, 2024
1 parent ea86296 commit aabeb1f
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 25 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
push:
branches-ignore:
- main
- dev
- kotlin-eap/*

jobs:
Expand Down
15 changes: 0 additions & 15 deletions .github/workflows/build-dev.yml

This file was deleted.

7 changes: 2 additions & 5 deletions .github/workflows/build-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 8 additions & 0 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions .github/workflows/publish-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ 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}}
ORG_GRADLE_PROJECT_sonatypeUsername: ${{secrets.sonatypeUsername}}
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}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-build-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit aabeb1f

Please sign in to comment.