From cdd4d22af6bb9b5c65934f7a170cb03f4b3e8249 Mon Sep 17 00:00:00 2001 From: malilex Date: Wed, 26 Jun 2024 20:37:38 +0300 Subject: [PATCH] build: Publication workflows were migrated to mavenPublish task. --- .github/workflows/publish-all-tokens-release.yml | 5 +++-- .github/workflows/publish-icons-release.yml | 11 ++--------- .github/workflows/publish-uikit-compose-release.yml | 11 ++--------- .github/workflows/publish-uikit-release.yml | 13 +++---------- 4 files changed, 10 insertions(+), 30 deletions(-) diff --git a/.github/workflows/publish-all-tokens-release.yml b/.github/workflows/publish-all-tokens-release.yml index 489158ed..06c1ea06 100644 --- a/.github/workflows/publish-all-tokens-release.yml +++ b/.github/workflows/publish-all-tokens-release.yml @@ -4,7 +4,7 @@ on: push: tags: # Здесь используется не полный regex для даты, т.к. валидность даты - здесь пока не критично - - "sdds-tokens-all-[0-9]{2}/[0-9]{2}/[0-9]{4}" + - "sdds-tokens-all-[0-9]{2}.[0-9]{2}.[0-9]{4}" concurrency: group: ${{ github.workflow }}-${{ github.head_ref }} @@ -26,7 +26,8 @@ jobs: OSS_SIGNING_KEY_ID: ${{ secrets.OSS_SIGNING_KEY_ID }} OSS_SIGNING_KEY: ${{ secrets.OSS_SIGNING_KEY }} OSS_SIGNING_PASSWORD: ${{ secrets.OSS_SIGNING_PASSWORD }} - run: ./gradlew :tokens:mavenPublishAll --info -PbranchName=main -PpublicationToken=${{ secrets.PP_AUTH_TOKEN }} + PP_AUTH_TOKEN: ${{ secrets.PP_AUTH_TOKEN }} + run: ./gradlew :tokens:mavenPublishAll --info -PbranchName=main - name: Upload distributions uses: actions/upload-artifact@v4 diff --git a/.github/workflows/publish-icons-release.yml b/.github/workflows/publish-icons-release.yml index 4c47fcc0..4c7939b4 100644 --- a/.github/workflows/publish-icons-release.yml +++ b/.github/workflows/publish-icons-release.yml @@ -26,18 +26,11 @@ jobs: OSS_SIGNING_KEY_ID: ${{ secrets.OSS_SIGNING_KEY_ID }} OSS_SIGNING_KEY: ${{ secrets.OSS_SIGNING_KEY }} OSS_SIGNING_PASSWORD: ${{ secrets.OSS_SIGNING_PASSWORD }} - run: ./gradlew :sdds-core:icons:generateDistributionZip --info -PbranchName=main + PP_AUTH_TOKEN: ${{ secrets.PP_AUTH_TOKEN }} + run: ./gradlew :sdds-core:icons:mavenPublish --info -PbranchName=main - name: Upload distribution uses: actions/upload-artifact@v4 with: name: distribution path: sdds-core/icons/build/distributions/*.zip - - - name: Maven Publish - uses: ./.github/actions/maven-publish - with: - bundle: sdds-core/icons/build/distributions/sdds-icons.zip - publishingType: 'USER_MANAGED' - publicationName: ${{ github.ref_name }} - publicationToken: ${{ secrets.PP_AUTH_TOKEN }} diff --git a/.github/workflows/publish-uikit-compose-release.yml b/.github/workflows/publish-uikit-compose-release.yml index 07b9b68a..7ebfe79a 100644 --- a/.github/workflows/publish-uikit-compose-release.yml +++ b/.github/workflows/publish-uikit-compose-release.yml @@ -26,18 +26,11 @@ jobs: OSS_SIGNING_KEY_ID: ${{ secrets.OSS_SIGNING_KEY_ID }} OSS_SIGNING_KEY: ${{ secrets.OSS_SIGNING_KEY }} OSS_SIGNING_PASSWORD: ${{ secrets.OSS_SIGNING_PASSWORD }} - run: ./gradlew :sdds-core:uikit-compose:generateDistributionZip --info -PbranchName=main + PP_AUTH_TOKEN: ${{ secrets.PP_AUTH_TOKEN }} + run: ./gradlew :sdds-core:uikit-compose:mavenPublish --info -PbranchName=main - name: Upload distribution uses: actions/upload-artifact@v4 with: name: distribution path: sdds-core/uikit-compose/build/distributions/*.zip - - - name: Maven Publish - uses: ./.github/actions/maven-publish - with: - bundle: sdds-core/uikit-compose/build/distributions/sdds-uikit-compose.zip - publishingType: 'USER_MANAGED' - publicationName: ${{ github.ref_name }} - publicationToken: ${{ secrets.PP_AUTH_TOKEN }} diff --git a/.github/workflows/publish-uikit-release.yml b/.github/workflows/publish-uikit-release.yml index d56a90b7..6adff24c 100644 --- a/.github/workflows/publish-uikit-release.yml +++ b/.github/workflows/publish-uikit-release.yml @@ -21,23 +21,16 @@ jobs: - name: Prepare environment uses: ./.github/actions/prepare-android-env - - name: Generate distribution zip + - name: Generate and publish distributions to maven env: OSS_SIGNING_KEY_ID: ${{ secrets.OSS_SIGNING_KEY_ID }} OSS_SIGNING_KEY: ${{ secrets.OSS_SIGNING_KEY }} OSS_SIGNING_PASSWORD: ${{ secrets.OSS_SIGNING_PASSWORD }} - run: ./gradlew :sdds-core:uikit:generateDistributionZip --info -PbranchName=main + PP_AUTH_TOKEN: ${{ secrets.PP_AUTH_TOKEN }} + run: ./gradlew :sdds-core:uikit:mavenPublish --info -PbranchName=main - name: Upload distribution uses: actions/upload-artifact@v4 with: name: distribution path: sdds-core/uikit/build/distributions/*.zip - - - name: Maven Publish - uses: ./.github/actions/maven-publish - with: - bundle: sdds-core/uikit/build/distributions/sdds-uikit.zip - publishingType: 'USER_MANAGED' - publicationName: ${{ github.ref_name }} - publicationToken: ${{ secrets.PP_AUTH_TOKEN }}