From 39d610ef2f0bef0addabf94c4aabb9bdd95c1f0f Mon Sep 17 00:00:00 2001 From: Roman Makeev Date: Thu, 16 Jan 2025 10:42:51 +0300 Subject: [PATCH] fix ci --- .github/workflows/call-publish-validation.yml | 6 +++--- .github/workflows/call-release.yml | 13 ++++++++----- .github/workflows/call-tests-validation.yml | 6 +++++- gradle.properties | 2 +- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.github/workflows/call-publish-validation.yml b/.github/workflows/call-publish-validation.yml index 7fb797c..1bf5ef7 100644 --- a/.github/workflows/call-publish-validation.yml +++ b/.github/workflows/call-publish-validation.yml @@ -1,4 +1,4 @@ -name: "Test publish" +name: "Validate local publish" on: workflow_call: secrets: @@ -14,12 +14,12 @@ on: required: true jobs: - tests: + validate_publish: strategy: matrix: target: - "publishToMavenLocal" - name: "Try publish local" + name: "Validate local publish" runs-on: ubuntu-latest env: ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALUSERNAME }} diff --git a/.github/workflows/call-release.yml b/.github/workflows/call-release.yml index 486935d..ec545c3 100644 --- a/.github/workflows/call-release.yml +++ b/.github/workflows/call-release.yml @@ -1,4 +1,4 @@ -name: "Test publish" +name: "Release version" on: workflow_call: secrets: @@ -15,7 +15,7 @@ on: jobs: publish: - name: "Try publish local" + name: "Publish on MavenCentral" runs-on: ubuntu-latest env: ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALUSERNAME }} @@ -38,8 +38,11 @@ jobs: arguments: publishAndReleaseToMavenCentral --stacktrace release: needs: [ publish ] - name: Create release + name: Create GitHub release runs-on: ubuntu-latest + # Only for personal repositories + permissions: + contents: write steps: - uses: actions/checkout@v4 # steps.properties.outputs.project-version-string @@ -55,7 +58,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.ACTIONS_TOKEN }} with: - tag_name: ${{ steps.properties.outputs.project-version-string }} - name: ${{ steps.properties.outputs.project-name }} - ${{ steps.properties.outputs.project-version-string }} + tag_name: ${{ steps.properties.outputs.makeevrserg-project-version-string }} + name: ${{ steps.properties.outputs.makeevrserg-project-name }} - ${{ steps.properties.outputs.makeevrserg-project-version-string }} draft: false prerelease: false diff --git a/.github/workflows/call-tests-validation.yml b/.github/workflows/call-tests-validation.yml index d039186..8920d13 100644 --- a/.github/workflows/call-tests-validation.yml +++ b/.github/workflows/call-tests-validation.yml @@ -4,6 +4,10 @@ on: jobs: tests: + strategy: + matrix: + target: + - "allTests" name: "Run tests" runs-on: ubuntu-latest steps: @@ -18,4 +22,4 @@ jobs: - name: Run tests uses: gradle/gradle-build-action@v3 with: - arguments: allTests \ No newline at end of file + arguments: ${{ matrix.target }} --stacktrace \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index ec714bf..58d6814 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,7 +19,7 @@ makeevrserg.java.ktarget=17 # Project makeevrserg.project.name=Paging makeevrserg.project.group=ru.astrainteractive.klibs -makeevrserg.project.version.string=2.3.2 +makeevrserg.project.version.string=2.3.3 makeevrserg.project.description=Kotlin Multiplatform paging library makeevrserg.project.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com makeevrserg.project.url=https://github.com/makeevrserg/klibs.paging