Merge pull request #42 from UbiqueInnovation/feature/gradle-task-update

Gradle Task Workflow update
UbiqueInnovation · Sep 26, 2024 · efe5063 · efe5063
2 parents 8ab731a + 9bb533d
commit efe5063
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 19 deletions.
diff --git a/.github/workflows/android_build_linth_upload.yml b/.github/workflows/android_build_linth_upload.yml
@@ -49,7 +49,7 @@ on:
         required: true
       UB_ARTIFACTORY_URL_ANDROID:
         required: true
-      UB_ARTIFACTORY_USERNAME:
+      UB_ARTIFACTORY_USER:
         required: true
       UB_ARTIFACTORY_PASSWORD:
         required: true
@@ -150,7 +150,7 @@ jobs:
           arguments: |
             :${{ inputs.appModule }}:clean :${{ inputs.appModule }}:uploadToLinth${{ steps.vars.outputs.flavor_capitalized }}Release
             -PubiqueMavenUrl=${{ secrets.UB_ARTIFACTORY_URL_ANDROID }}
-            -PubiqueMavenUser=${{ secrets.UB_ARTIFACTORY_USERNAME }}
+            -PubiqueMavenUser=${{ secrets.UB_ARTIFACTORY_USER }}
             -PubiqueMavenPass=${{ secrets.UB_ARTIFACTORY_PASSWORD }}
             -PubiquePoEditorAPIKey=${{ secrets.UBIQUE_POEDITOR_API_KEY }}
             -Pbuild_batch=${{ steps.vars.outputs.build_batch }}

diff --git a/.github/workflows/android_build_store_upload.yml b/.github/workflows/android_build_store_upload.yml
@@ -19,7 +19,7 @@ on:
         required: true
       UB_ARTIFACTORY_URL_ANDROID:
         required: true
-      UB_ARTIFACTORY_USERNAME:
+      UB_ARTIFACTORY_USER:
         required: true
       UB_ARTIFACTORY_PASSWORD:
         required: true
@@ -80,7 +80,7 @@ jobs:
           arguments: |
             :${{ inputs.appModule }}:bundle${{ steps.vars.outputs.flavor_capitalized }}ReleaseUpload
             -PubiqueMavenUrl=${{ secrets.UB_ARTIFACTORY_URL_ANDROID }}
-            -PubiqueMavenUser=${{ secrets.UB_ARTIFACTORY_USERNAME }}
+            -PubiqueMavenUser=${{ secrets.UB_ARTIFACTORY_USER }}
             -PubiqueMavenPass=${{ secrets.UB_ARTIFACTORY_PASSWORD }}
             -PubiquePoEditorAPIKey=${{ secrets.UBIQUE_POEDITOR_API_KEY }}
             ${{ secrets.ADDITIONAL_GRADLE_PROPS }}
@@ -102,7 +102,7 @@ jobs:
           arguments: |
             :${{ inputs.appModule }}:publish${{ steps.vars.outputs.flavor_capitalized }}ReleaseUploadBundle --artifact-dir ${{ inputs.appModule }}/build/outputs/bundle/${{ inputs.flavor }}ReleaseUpload
             -PubiqueMavenUrl=${{ secrets.UB_ARTIFACTORY_URL_ANDROID }}
-            -PubiqueMavenUser=${{ secrets.UB_ARTIFACTORY_USERNAME }}
+            -PubiqueMavenUser=${{ secrets.UB_ARTIFACTORY_USER }}
             -PubiqueMavenPass=${{ secrets.UB_ARTIFACTORY_PASSWORD }}
             -PubiquePoEditorAPIKey=${{ secrets.UBIQUE_POEDITOR_API_KEY }}
             ${{ secrets.ADDITIONAL_GRADLE_PROPS }}

diff --git a/.github/workflows/android_build_ubdiag_upload.yml b/.github/workflows/android_build_ubdiag_upload.yml
@@ -51,7 +51,7 @@ on:
         required: true
       UB_ARTIFACTORY_URL_ANDROID:
         required: true
-      UB_ARTIFACTORY_USERNAME:
+      UB_ARTIFACTORY_USER:
         required: true
       UB_ARTIFACTORY_PASSWORD:
         required: true
@@ -146,7 +146,7 @@ jobs:
           arguments: |
             :${{ inputs.appModule }}:clean :${{ inputs.appModule }}:assemble${{ steps.vars.outputs.flavor_capitalized }}Release
             -PubiqueMavenUrl=${{ secrets.UB_ARTIFACTORY_URL_ANDROID }}
-            -PubiqueMavenUser=${{ secrets.UB_ARTIFACTORY_USERNAME }}
+            -PubiqueMavenUser=${{ secrets.UB_ARTIFACTORY_USER }}
             -PubiqueMavenPass=${{ secrets.UB_ARTIFACTORY_PASSWORD }}
             -PubiquePoEditorAPIKey=${{ secrets.UBIQUE_POEDITOR_API_KEY }}
             -Pbranch=${{ github.ref_name }}

diff --git a/.github/workflows/android_code_quality.yml b/.github/workflows/android_code_quality.yml
@@ -53,7 +53,7 @@ on:
         required: true
       UB_ARTIFACTORY_URL_ANDROID:
         required: true
-      UB_ARTIFACTORY_USERNAME:
+      UB_ARTIFACTORY_USER:
         required: true
       UB_ARTIFACTORY_PASSWORD:
         required: true
@@ -107,7 +107,7 @@ jobs:
         run: |
           export flavor=${{ inputs.flavor }}
           echo "flavor_capitalized=${flavor~}" >> "$GITHUB_OUTPUT"
-          export gradleProps="-PsentryAuthToken=${{ secrets.SENTRY_AUTH_TOKEN }} -PubiqueMavenUrl=${{ secrets.UB_ARTIFACTORY_URL_ANDROID }} -PubiqueMavenUser=${{ secrets.UB_ARTIFACTORY_USERNAME }} -PubiqueMavenPass=${{ secrets.UB_ARTIFACTORY_PASSWORD }} -PubiquePoEditorAPIKey=${{ secrets.UBIQUE_POEDITOR_API_KEY }} ${{ secrets.ADDITIONAL_GRADLE_PROPS }}"
+          export gradleProps="-PsentryAuthToken=${{ secrets.SENTRY_AUTH_TOKEN }} -PubiqueMavenUrl=${{ secrets.UB_ARTIFACTORY_URL_ANDROID }} -PubiqueMavenUser=${{ secrets.UB_ARTIFACTORY_USER }} -PubiqueMavenPass=${{ secrets.UB_ARTIFACTORY_PASSWORD }} -PubiquePoEditorAPIKey=${{ secrets.UBIQUE_POEDITOR_API_KEY }} ${{ secrets.ADDITIONAL_GRADLE_PROPS }}"
           echo "gradle_properties=$gradleProps" >> "$GITHUB_OUTPUT"
 
       # Setup JDK environment
@@ -214,7 +214,7 @@ jobs:
         run: |
           export flavor=${{ inputs.flavor }}
           echo "flavor_capitalized=${flavor~}" >> "$GITHUB_OUTPUT"
-          export gradleProps="-PsentryAuthToken=${{ secrets.SENTRY_AUTH_TOKEN }} -PubiqueMavenUrl=${{ secrets.UB_ARTIFACTORY_URL_ANDROID }} -PubiqueMavenUser=${{ secrets.UB_ARTIFACTORY_USERNAME }} -PubiqueMavenPass=${{ secrets.UB_ARTIFACTORY_PASSWORD }} -PubiquePoEditorAPIKey=${{ secrets.UBIQUE_POEDITOR_API_KEY }} ${{ secrets.ADDITIONAL_GRADLE_PROPS }}"
+          export gradleProps="-PsentryAuthToken=${{ secrets.SENTRY_AUTH_TOKEN }} -PubiqueMavenUrl=${{ secrets.UB_ARTIFACTORY_URL_ANDROID }} -PubiqueMavenUser=${{ secrets.UB_ARTIFACTORY_USER }} -PubiqueMavenPass=${{ secrets.UB_ARTIFACTORY_PASSWORD }} -PubiquePoEditorAPIKey=${{ secrets.UBIQUE_POEDITOR_API_KEY }} ${{ secrets.ADDITIONAL_GRADLE_PROPS }}"
           echo "gradle_properties=$gradleProps" >> "$GITHUB_OUTPUT"
 
       - name: Install zstd

diff --git a/.github/workflows/android_gradle_task.yml b/.github/workflows/android_gradle_task.yml
@@ -36,9 +36,11 @@ on:
         default: local
         type: string
     secrets:
-      UB_ARTIFACTORY_URL_ANDROID:
+      UB_ARTIFACTORY_URL:
         required: true
-      UB_ARTIFACTORY_USERNAME:
+      UB_ARTIFACTORY_REPO_ANDROID:
+        required: true
+      UB_ARTIFACTORY_USER:
         required: true
       UB_ARTIFACTORY_PASSWORD:
         required: true
@@ -50,7 +52,7 @@ on:
 
 jobs:
   task:
-    runs-on: ['k8s-runner']
+    runs-on: [ 'k8s-runner' ]
     container:
       image: cimg/android:2024.04.1-ndk
     defaults:
@@ -65,6 +67,7 @@ jobs:
       - uses: actions/[email protected]
       - name: Install zstd
         run: sudo apt-get install -y zstd
+
       - name: Cache Gradle packages on self-hosted MinIO
         uses: tespkg/[email protected]
         if: false # Disabled for now to test if it's faster without it
@@ -83,9 +86,16 @@ jobs:
           key: cimg-android-${{ inputs.projectKey }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}-${{ inputs.task }}
           restore-keys: |
             cimg-android-${{ inputs.projectKey }}-gradle-
+
       - name: Run Gradle task
+        uses: gradle/actions/[email protected]
         env:
-          UB_ARTIFACTORY_URL_ANDROID: ${{ secrets.UB_ARTIFACTORY_URL_ANDROID }}
+          UB_ARTIFACTORY_URL: ${{ secrets.UB_ARTIFACTORY_URL }}
+          UB_ARTIFACTORY_REPO_ANDROID: ${{ secrets.UB_ARTIFACTORY_REPO_ANDROID }}
+          UB_ARTIFACTORY_URL_ANDROID: '${{ secrets.UB_ARTIFACTORY_URL }}${{ secrets.UB_ARTIFACTORY_REPO_ANDROID }}'
           UB_ARTIFACTORY_USER: ${{ secrets.UB_ARTIFACTORY_USER }}
           UB_ARTIFACTORY_PASSWORD: ${{ secrets.UB_ARTIFACTORY_PASSWORD }}
-        run: ./gradlew ${{ inputs.task }} ${{ inputs.gradleArgs }}
+        with:
+          cache-disabled: true
+          build-root-directory: './'
+          arguments: ${{ inputs.task }} ${{ inputs.gradleArgs }}
diff --git a/.github/workflows/android_library_artifactory.yml b/.github/workflows/android_library_artifactory.yml
@@ -28,7 +28,7 @@ on:
         required: true
       UB_ARTIFACTORY_URL_ANDROID:
         required: true
-      UB_ARTIFACTORY_USERNAME:
+      UB_ARTIFACTORY_USER:
         required: true
       UB_ARTIFACTORY_PASSWORD:
         required: true
@@ -82,7 +82,7 @@ jobs:
           arguments: |
             :${{ inputs.libModule }}:publish
             -PubiqueMavenUrl=${{ secrets.UB_ARTIFACTORY_URL_ANDROID }}
-            -PubiqueMavenUser=${{ secrets.UB_ARTIFACTORY_USERNAME }}
+            -PubiqueMavenUser=${{ secrets.UB_ARTIFACTORY_USER }}
             -PubiqueMavenPass=${{ secrets.UB_ARTIFACTORY_PASSWORD }}
         env:
           UB_ARTIFACTORY_URL_ANDROID: ${{ secrets.UB_ARTIFACTORY_URL_ANDROID }}

diff --git a/.github/workflows/multiplatform_library_artifactory.yml b/.github/workflows/multiplatform_library_artifactory.yml
@@ -28,7 +28,7 @@ on:
         required: true
       UB_ARTIFACTORY_URL_ANDROID:
         required: true
-      UB_ARTIFACTORY_USERNAME:
+      UB_ARTIFACTORY_USER:
         required: true
       UB_ARTIFACTORY_PASSWORD:
         required: true
@@ -82,7 +82,7 @@ jobs:
           arguments: |
             :${{ inputs.libModule }}:publish
             -PubiqueMavenUrl=${{ secrets.UB_ARTIFACTORY_URL_ANDROID }}
-            -PubiqueMavenUser=${{ secrets.UB_ARTIFACTORY_USERNAME }}
+            -PubiqueMavenUser=${{ secrets.UB_ARTIFACTORY_USER }}
             -PubiqueMavenPass=${{ secrets.UB_ARTIFACTORY_PASSWORD }}
         env:
           UB_ARTIFACTORY_URL_ANDROID: ${{ secrets.UB_ARTIFACTORY_URL_ANDROID }}