From f2c6facce09dc096366233c255b406f3104ca8c7 Mon Sep 17 00:00:00 2001 From: "r46-publisherlegacy[bot]" <161856912+r46-publisherlegacy[bot]@users.noreply.github.com> Date: Wed, 20 Aug 2025 18:12:33 +0000 Subject: [PATCH] feat(release): sync --- .github/actions/publish/action.yml | 1 + .github/workflows/publish.yaml | 39 ------------------- .github/workflows/publish.yml | 27 +++++++++++++ .../workflows/{version.yaml => version.yml} | 12 +++--- generator/build.gradle.kts | 3 +- 5 files changed, 34 insertions(+), 48 deletions(-) delete mode 100644 .github/workflows/publish.yaml create mode 100644 .github/workflows/publish.yml rename .github/workflows/{version.yaml => version.yml} (73%) diff --git a/.github/actions/publish/action.yml b/.github/actions/publish/action.yml index a566e26..354f763 100644 --- a/.github/actions/publish/action.yml +++ b/.github/actions/publish/action.yml @@ -40,3 +40,4 @@ runs: ./gradlew :android:publishAllPublicationsToGitHubPackagesRepository ./gradlew :compose:publishAllPublicationsToGitHubPackagesRepository ./gradlew :multiplatform:publishAllPublicationsToGitHubPackagesRepository + ./gradlew :generator:publishAllPublicationsToGitHubPackagesRepository diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml deleted file mode 100644 index d20d532..0000000 --- a/.github/workflows/publish.yaml +++ /dev/null @@ -1,39 +0,0 @@ -name: Publish to sonatype and GH-packages - -on: - pull_request: - types: - - closed - branches: - - master - workflow_dispatch: - -jobs: - publish: - if: | - github.event_name == 'workflow_dispatch' || - ( - github.event.pull_request.merged == true && - startsWith(github.head_ref, 'release/') - ) - uses: rees46/workflow/.github/workflows/reusable-android-publish.yaml@master - permissions: write-all - with: - appId: ${{ vars.PUBLISHER_ID }} - PROPERTIES_FILE: gradle.properties - SIGNING_SECRET_KEY_RING_FILE: com.rees46.key.gpg - SIGNING_SECRET_KEY_RING_FILE_LOCATION: ./ - OSSRH_USERNAME: ${{ vars.OSSRH_USERNAME }} - VARIANT_NAME: ${{ vars.REES_VARIANT_NAME }} - URL: https://maven.pkg.github.com/rees46/kmp - MAVEN_REPOSITORY_URL: https://maven.pkg.github.com/rees46/kmp - GRADLE_VERSION: 8.8 - secrets: - appSecret: ${{ secrets.PUBLISHER_SECRET }} - SONATA_STAGING_PROFILE_ID: ${{ secrets.SONATA_STAGING_PROFILE_ID }} - SONATA_USERNAME: ${{ secrets.SONATA_USERNAME }} - SONATA_PASSWORD: ${{ secrets.SONATA_PASSWORD }} - OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} - SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }} - SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }} - SIGNING_KEY_FILE_AS_BASE64_STRING: ${{ secrets.SIGNING_KEY_FILE_AS_BASE64_STRING }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 0000000..3eceea4 --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,27 @@ +name: Publish to GH-packages + +on: + pull_request: + types: + - closed + branches: + - master + workflow_dispatch: + +jobs: + publish: + if: | + github.event_name == 'workflow_dispatch' || + ( + github.event.pull_request.merged == true && + startsWith(github.head_ref, 'release/') + ) + permissions: write-all + runs-on: ubuntu-latest + steps: + - uses: rees46/kmp/.github/actions/publish@master + if: github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch' + with: + appId: ${{ vars.PUBLIVERSIONER_ID }} + appSecret: ${{ secrets.PUBLIVERSIONER_SECRET }} + githubToken: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/version.yaml b/.github/workflows/version.yml similarity index 73% rename from .github/workflows/version.yaml rename to .github/workflows/version.yml index cfa9262..4048a29 100644 --- a/.github/workflows/version.yaml +++ b/.github/workflows/version.yml @@ -5,25 +5,23 @@ on: branches: - master paths-ignore: - - .github + - ".github/**" workflow_dispatch: jobs: find-release-commit: uses: rees46/workflow/.github/workflows/reusable-release-commit-finder.yaml@master with: - commitMessage: 'feat(release): version' + commitMessage: "feat(release): version" secrets: githubToken: ${{ secrets.GITHUB_TOKEN }} bump-version: needs: find-release-commit if: | - github.event_name == 'workflow_dispatch' || - ( + github.event_name == 'workflow_dispatch' || ( github.event_name == 'push' && - needs.find-release-commit.outputs.hasCommit == 'false' - ) + needs.find-release-commit.outputs.hasCommit == 'false') uses: rees46/workflow/.github/workflows/reusable-multiplatform-version-bump.yaml@master permissions: write-all secrets: @@ -31,4 +29,4 @@ jobs: githubToken: ${{ secrets.GITHUB_TOKEN }} with: appId: ${{ vars.PUBLIVERSIONER_ID }} - reviewerUsername: ${{ vars.REVIEWER_USERNAME }} + reviewerUsername: iwwwanow diff --git a/generator/build.gradle.kts b/generator/build.gradle.kts index 2c039de..36b8b5c 100644 --- a/generator/build.gradle.kts +++ b/generator/build.gradle.kts @@ -4,8 +4,7 @@ plugins { `maven-publish` } -group = "com.rees46" -version = "1.0.0" +apply(from = rootProject.file("publishing.gradle.kts")) repositories { mavenCentral()