CI change 7

tangem · Jun 4, 2024 · 439bb8e · 439bb8e
1 parent 739695e
commit 439bb8e
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 15 deletions.
diff --git a/.github/workflows/neutral-build.yml b/.github/workflows/neutral-build.yml
@@ -30,7 +30,6 @@ jobs:
           cd ${{ github.workspace }}/vico
           VERSION_NAME=$(grep -oP "(?<=version_name).*(?=\",)" versions.gradle | grep -oP "(?<=\").*")
           echo "VERSION_NAME=$VERSION_NAME" >> $GITHUB_ENV
-          echo "TAG_NAME=v$VERSION_NAME" >> $GITHUB_ENV
           ./gradlew assembleDebug
 
       - name: Create tag
@@ -41,7 +40,7 @@ jobs:
             github.git.createRef({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              ref: "refs/tags/${{ env.VERSION_NAME }}",
+              ref: "refs/tags/${{ env.VERSION_NAME }}-tangem${{ github.run_number }}",
               sha: context.sha
             })
 
@@ -52,7 +51,7 @@ jobs:
         run: |
           cd ${{ github.workspace }}/vico
           echo sdk.dir = $ANDROID_HOME > local.properties
-          ./gradlew -PgithubUser=${{ secrets.GITHUB_ACTOR }} -PgithubPass=${{ secrets.GITHUB_TOKEN }} -PartifactVersion=${{ env.VERSION_NAME }} publish
+          ./gradlew -PgithubUser=${{ secrets.GITHUB_ACTOR }} -PgithubPass=${{ secrets.GITHUB_TOKEN }} -PpublishVersion=${{ env.VERSION_NAME }}-tangem${{ github.run_number }} publish
 
       - name: Build notification
         if: always()
@@ -64,5 +63,5 @@ jobs:
           failure_text: 'GitHub Action #${{ github.run_number }} failed. Tag has not been not created.'
           cancelled_text: 'GitHub Action #${{ github.run_number }} was cancelled'
           fields: |
-            [{"title": "TAG", "value": "${{ env.VERSION_NAME }}"},
+            [{"title": "TAG", "value": "${{ env.VERSION_NAME }}-tangem${{ github.run_number }}"},
             {"title": "Action URL", "value": "${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}/actions/runs/${env.GITHUB_RUN_ID}"}]
diff --git a/common-scripts.gradle b/common-scripts.gradle
@@ -75,12 +75,6 @@ void customizePom(MavenPom pom) {
             url = "http://www.apache.org/licenses/LICENSE-2.0.txt"
         }
     }
-
-    pom.scm {
-        connection = "scm:git:git://github.com/tangem/vico.git"
-        developerConnection = "scm:git:ssh://github.com/tangem/vico.git"
-        url = "https://github.com/patrykandpatrick/vico"
-    }
 }
 
 boolean isReleaseVersion() {

diff --git a/versions.gradle b/versions.gradle
@@ -19,7 +19,8 @@ ext {
     library = [
             groupId        : "com.patrykandpatrick.vico",
             publishGroupId : "com.tangem.vico",
-            version_name   : "2.0.0-alpha.21-tangem1",
+            version_name   : "2.0.0-alpha.21",
+            publishVersion : project.hasProperty('publishVersion') ? project.getProperty('publishVersion') : '0.0.1',
             version_code   : 1,
             target_sdk     : 34,
             min_sdk        : 19,

diff --git a/vico/compose-m2/build.gradle b/vico/compose-m2/build.gradle
@@ -54,7 +54,7 @@ afterEvaluate {
 
                 groupId = library.publishGroupId
                 artifactId = getArtifactId(project)
-                version = project.version
+                version = library.publishVersion
                 from components.release
 
                 customizePom(pom)

diff --git a/vico/compose-m3/build.gradle b/vico/compose-m3/build.gradle
@@ -55,7 +55,7 @@ afterEvaluate {
 
                 groupId = library.publishGroupId
                 artifactId = getArtifactId(project)
-                version = project.version
+                version = library.publishVersion
                 from components.release
 
                 customizePom(pom)

diff --git a/vico/compose/build.gradle b/vico/compose/build.gradle
@@ -55,7 +55,7 @@ afterEvaluate {
 
                 groupId = library.publishGroupId
                 artifactId = getArtifactId(project)
-                version = project.version
+                version = library.publishVersion
                 from components.release
 
                 customizePom(pom)

diff --git a/vico/core/build.gradle b/vico/core/build.gradle
@@ -46,7 +46,7 @@ afterEvaluate {
 
                 groupId = library.publishGroupId
                 artifactId = getArtifactId(project)
-                version = project.version
+                version = library.publishVersion
                 from components.release
 
                 customizePom(pom)