PWN-6722 - Changelog fixes & Kotlin DSL migration

.github/actions/setup-changelog/action.yml

@@ -0,0 +1,26 @@
+name: "Generate changelog"
+description: "Getting commits from last commit hash to current one"
+
+runs:
+  using: composite
+  steps:
+    - name: "Find last commit hash and current one"
+      shell: bash
+      run: |
+        # Get the latest commit hash was saved in last_commit_hash.txt
+        last_commit_hash=$(cat last_commit_hash.txt)
+
+        # Fetch the latest changes from the remote repository
+        git fetch origin
+
+        # Determine the current head commit hash
+        if [ -n "$GITHUB_HEAD_REF" ]; then
+          # This is a pull request, use GITHUB_HEAD_REF
+          current_commit_hash="$(git log -n 1 --pretty=%H origin/$GITHUB_HEAD_REF)"
+        else
+          # This is not a pull request, use GITHUB_BASE_REF
+          current_commit_hash="$(git log -n 1 --pretty=%H origin/$GITHUB_BASE_REF)"
+        fi
+
+        # Run the gradle task with the fromCommit and toCommit properties set
+        ./gradlew gitChangelogTask -PfromCommit=$last_commit_hash -PtoCommit=$current_commit_hash

.github/actions/setup-jira-rft/action.yml

@@ -20,9 +20,9 @@ runs:
         echo "JIRA Ticket: $jira_ticket"
       env:
         jira-ticket: ${{ steps.find-jira-ticket.outputs.jira_ticket }}
-    - name: Update JIRA issue status
+    - name: "Update JIRA issue status"
       shell: bash
-      if: env.jira-ticket
+      if: steps.find-jira-ticket.outputs.jira_ticket != ''
       run: |
         curl -D- -H "Authorization: Basic ${{ inputs.jira-api-token }}" \
           -X PUT \

.github/actions/setup-slack/action.yml

@@ -24,6 +24,5 @@ runs:
         curl \
         -F token="${{ inputs.bot-token }}" \
         -F channels="${{ inputs.channel-id }}" \
-        -F initial_comment="Hey! Build type: ${{ inputs.build-type }} artifact type: ${{ inputs.artifact-type }}. Success :tada:" \
         -F "file=@$(find app/build/outputs/${{ inputs.artifact-type }}/${{ inputs.build-type }} -name 'key-app*')" \
         https://slack.com/api/files.upload

.github/actions/setup-version-build/action.yml

@@ -13,7 +13,7 @@ runs:
         run_number=${{ github.run_number }}
 
         # Combine the timestamp with the GITHUB_RUN_NUMBER
-        version=$((timestamp / run_number))
+        version=$((timestamp + run_number))
 
         # Set the version build number using the unique identifier
         ./gradlew setVersionBuild -Pversion=$version

.github/workflows/android-develop-workflow.yml

@@ -12,6 +12,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: develop
       - name: "Initialize project keys"
         uses: ./.github/actions/setup-project
         with:
@@ -41,6 +43,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: develop
       - name: "Initializing firebase configs"
         uses: ./.github/actions/setup-google-services
         with:
@@ -76,6 +80,7 @@ jobs:
       - name: "Checkout to the current commit hash"
         uses: actions/checkout@v3
         with:
+          ref: develop
           fetch-depth: 0
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
       - name: "Initializing firebase configs"
@@ -101,11 +106,10 @@ jobs:
           sentry-auth-dsn: ${{ secrets.SENTRY_AUTH_DSN }}
           lokalise-key: ${{ secrets.LOKALISE_KEY }}
           lokalise-app-id: ${{ secrets.LOKALISE_APP_ID }}
+      - name: "Generate changelog"
+        uses: ./.github/actions/setup-changelog
       - name: "Send start deploy message to slack"
-        run: |
-          cd bash_scripts
-          bash slack_deploy_start_message.sh ${{ secrets.SLACK_BOT_TOKEN }} ${{ secrets.SLACK_CHANNEL_ID }}
-          cd ..
+        run: bash bash_scripts/slack_deploy_start_message.sh ${{ secrets.SLACK_BOT_TOKEN }} ${{ secrets.SLACK_CHANNEL_ID }}
       - name: "Generate a unique version build"
         uses: ./.github/actions/setup-version-build
       - name: "Build feature APK"
@@ -123,17 +127,11 @@ jobs:
           build-type: "feature"
           artifact-type: "apk"
       - name: "Upload changelog, and Jira ticket to slack channel"
-        run: |
-          cd bash_scripts
-          value=`cat timestamp.txt`
-          bash slack_develop_changelog.sh ${{ secrets.SLACK_BOT_TOKEN }} ${{ secrets.SLACK_CHANNEL_ID }}
-          cd ..
-
+        run: bash bash_scripts/slack_upload_changelog.sh ${{ secrets.SLACK_BOT_TOKEN }} ${{ secrets.SLACK_CHANNEL_ID }} CHANGELOG.txt
       - name: "Send finish deploy message to slack"
         run: |
-          cd bash_scripts
           value=`cat timestamp.txt`
-          bash slack_deploy_finish_message.sh ${{ secrets.SLACK_BOT_TOKEN }} ${{ secrets.SLACK_CHANNEL_ID }} $value
+          bash bash_scripts/slack_deploy_finish_message.sh ${{ secrets.SLACK_BOT_TOKEN }} ${{ secrets.SLACK_CHANNEL_ID }} $value
       - name: "Commit and Push changes"
         uses: ./.github/actions/setup-commit
         with:
@@ -145,8 +143,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: develop
       - name: "Find a Jira ticket and move it to READY FOR TESTING"
         uses: ./.github/actions/setup-jira-rft
         with:
           jira-base-url: ${{ vars.JIRA_BASE_URL }}
-          jira-api-token: ${{ secrets.JIRA_API_TOKEN }}
+          jira-api-token: ${{ secrets.JIRA_API_TOKEN }}
+  save-last-commit-hash:
+    name: "Save last commit hash for future changelogs"
+    needs:
+      - android-build-artifacts
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: develop
+      - name: "Get last commit hash and save into last_commit_hash.txt"
+        run: printf "$(git log -n 1 --pretty=%H)" > last_commit_hash.txt

.github/workflows/android-feature-workflow.yml

@@ -34,8 +34,8 @@ jobs:
         run: ./gradlew ktlint -PautoCorrect=0
   android-build-artifacts:
     name: "Run build feature artifacts"
-    needs:
-      - android-lint
+#    needs:
+#      - android-lint
 
     runs-on: ubuntu-latest
     environment: manual
@@ -65,11 +65,11 @@ jobs:
           sentry-auth-dsn: ${{ secrets.SENTRY_AUTH_DSN }}
           lokalise-key: ${{ secrets.LOKALISE_KEY }}
           lokalise-app-id: ${{ secrets.LOKALISE_APP_ID }}
+      - name: "Generate changelog"
+        uses: ./.github/actions/setup-changelog
       - name: "Send start deploy message to slack"
         run: |
-          cd bash_scripts
-          bash slack_deploy_start_message.sh ${{ secrets.SLACK_BOT_TOKEN }} ${{ secrets.SLACK_CHANNEL_ID }}
-          cd ..
+          bash bash_scripts/slack_deploy_start_message.sh ${{ secrets.SLACK_BOT_TOKEN }} ${{ secrets.SLACK_CHANNEL_ID }}
       - name: "Build feature APK"
         run: ./gradlew assembleFeature
       - name: "Build & upload APK to Firebase (Feature)"
@@ -86,13 +86,8 @@ jobs:
           artifact-type: "apk"
       - name: "Upload changelog, and Jira ticket to slack channel"
         run: |
-          cd bash_scripts
-          value=`cat timestamp.txt`
-          bash slack_shortlog_changelog.sh ${{ secrets.SLACK_BOT_TOKEN }} ${{ secrets.SLACK_CHANNEL_ID }} "develop"
-          cd ..
-
+          bash bash_scripts/slack_upload_changelog.sh ${{ secrets.SLACK_BOT_TOKEN }} ${{ secrets.SLACK_CHANNEL_ID }} CHANGELOG.txt
       - name: "Send finish deploy message to slack"
         run: |
-          cd bash_scripts
           value=`cat timestamp.txt`
-          bash slack_deploy_finish_message.sh ${{ secrets.SLACK_BOT_TOKEN }} ${{ secrets.SLACK_CHANNEL_ID }} $value
+          bash bash_scripts/slack_deploy_finish_message.sh ${{ secrets.SLACK_BOT_TOKEN }} ${{ secrets.SLACK_CHANNEL_ID }} $value

.github/workflows/android-release-workflow.yml

@@ -12,12 +12,6 @@ jobs:
     steps:
       - name: "Checkout to the current commit hash"
         uses: actions/checkout@v3
-      - name: "Send start deploy message to slack"
-        run: |
-          cd bash_scripts
-          bash slack_deploy_start_message.sh ${{ secrets.SLACK_BOT_TOKEN }} ${{ secrets.SLACK_CHANNEL_ID }}
-          cd ..
-
       - name: "Create release signing configs properties"
         uses: ./.github/actions/setup-signing-configs
         with:
@@ -61,16 +55,4 @@ jobs:
           bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
           channel-id: ${{ secrets.SLACK_CHANNEL_ID }}
           build-type: "release"
-          artifact-type: "bundle"
-      - name: "Upload git changelog and Jira ticket to Slack channel"
-        run: |
-          cd bash_scripts
-          value=`cat timestamp.txt`
-          bash slack_shortlog_changelog.sh ${{ secrets.SLACK_BOT_TOKEN }} ${{ secrets.SLACK_CHANNEL_ID }} "main"
-          cd ..
-
-      - name: "Send finish deploy message to Slack"
-        run: |
-          cd bash_scripts
-          value=`cat timestamp.txt`
-          bash slack_deploy_finish_message.sh ${{ secrets.SLACK_BOT_TOKEN }} ${{ secrets.SLACK_CHANNEL_ID }} $value
+          artifact-type: "bundle"

scripts/changelog.gradle → .scripts/changelog.gradle

@@ -42,4 +42,18 @@ ext.releaseChangelog = { releaseName, buildType ->
             .append("Release notes:\n")
             .append("${branchChangelog()}")
             .toString()
+}
+
+task gitChangelogTask(type: Exec) {
+    def from = findProperty('fromCommit')
+    def to = findProperty('toCommit')
+
+    executable "sh"
+    args "-c", "git log $from..$to --no-merges --pretty=format:\"%h - %s - %an\" > CHANGELOG.txt"
+
+    doFirst {
+        if (from == null || to == null) {
+            throw new GradleException("fromCommit or toCommit is not defined. Did you set properties? (-PfromCommit=somecommithash -PtoCommit=somecommithash)")
+        }
+    }
 }

.scripts/dependencies.gradle

@@ -0,0 +1,10 @@
+ext {
+    sdkMinVersion = 26
+    sdkTargetVersion = 33
+    sdkCompileVersion = 33
+
+    // https://github.com/shyiko/ktlint
+    ktlintVersion = '0.45.2'
+
+    kotlinVersion = '1.7.20'
+}

.scripts/versioning.gradle.kts

@@ -0,0 +1,25 @@
+// example './gradlew setVersionBuild -Pversion=10'
+tasks.register("setVersionBuild", Exec::class) {
+    doLast {
+        val version = project.findProperty("version") as Long?
+
+        if (version == null) {
+            logger.error("Invalid version argument, usage: ./gradlew setVersionBuild -Pversion=10")
+            return@doLast
+        }
+
+        val appVersionsClass = File("${rootProject.projectDir}/buildSrc/src/main/java/AppVersions.kt")
+        if (!appVersionsClass.exists()) {
+            logger.error("AppVersions.kt not found in buildSrc/src/main/java/")
+            return@doLast
+        }
+
+        appVersionsClass.forEachLine { line ->
+            if (line.contains("const val VERSION_BUILD")) {
+                val newLine = "    const val VERSION_BUILD = $version\n"
+                appVersionsClass.writeText(appVersionsClass.readText().replace(line, newLine))
+                logger.quiet("VERSION_BUILD updated to $version")
+            }
+        }
+    }
+}