add step top fetch latest tag

duckduckgo · Oct 23, 2024 · e38c99a · e38c99a
1 parent 380feb8
commit e38c99a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 43 deletions.
diff --git a/.github/workflows/release_production.yml b/.github/workflows/release_production.yml
@@ -17,19 +17,21 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Setup JDK 20
-        uses: actions/setup-java@v3
-        with:
-          distribution: temurin
-          java-version: 20
-
-      - name: Make gradlew executable
-        run: chmod +x ./gradlew
+      - name: Fetch Latest Git Tag
+        id: fetch_tag
+        run: |          
+          git fetch --tags
+          TAG=$(git describe --tags --abbrev=0)
+          echo "latest_tag=$TAG" >> $GITHUB_ENV        
+
+      - name: Show the latest tag
+        run: |
+          echo "The latest git tag is: ${{ steps.fetch_tag.outputs.latest_tag }}"
 
       - name: Generate nightly version name
         id: generate_version_name
         run: |
-          output=$(./gradlew getBuildVersionName -PversionNameSuffix=-nightly | tail -n 1)                  
+          output=$(./gradlew getBuildVersionName -PversionNameSuffix=-nightly -PlatestTag= ${{ steps.fetch_tag.outputs.latest_tag }} -q | tail -n 1)                  
           echo "version=$output" >> $GITHUB_OUTPUT
 
       - name: Use the captured output

diff --git a/app/version/version.properties b/app/version/version.properties
@@ -1,4 +1,2 @@
 #Wed Oct 23 11:43:47 CEST 2024
-NEW_TAG=5.217.0.10-nightly
-VERSION=5.217.0
-TAG=5.217.0.9-nightly
+VERSION=5.217.0
diff --git a/versioning.gradle b/versioning.gradle
@@ -36,9 +36,12 @@ ext {
     }
 
     getStoredTag = {
-        def props = new Properties()
-        file("$rootDir/app/version/version.properties").withInputStream { props.load(it) }
-        return props.getProperty("TAG")
+        if(project.hasProperty("latestTag")) {
+            return project["latestTag"]
+        } else {
+            def latestGitTagProvider = providers.of(LatestGitTagValueSource.class) {}
+            return latestGitTagProvider.get()
+        }
     }
 
     buildNumberCode = {
@@ -63,34 +66,6 @@ ext {
     }
 }
 
-tasks.register('incrementTag') {
-    doLast {
-        if (project.hasProperty("versionNameSuffix")) {
-            println("Incrementing tag for Nightly release")
-        } else {
-            println("Incrementing tag for Production release")
-        }
-
-        def filePath = "$rootDir/app/version/version.properties"
-        if(!new File(filePath).exists()) {
-            return
-        }
-
-        def props = new Properties()
-        props.load(new FileInputStream(filePath))
-        String currentTag = props["TAG"]
-        println("Current tag is $currentTag")
-
-        def versionName = buildVersionName()
-
-        println("Storing new tag as $versionName")
-
-        props["NEW_TAG"] = versionName.toString()
-        def os = new FileOutputStream(filePath)
-        props.store(os, null)
-    }
-}
-
 tasks.register("setBuildNumber") {
     doLast {
         if(!project.hasProperty("number")) {