Tâches personnalisées

.github/workflows/build-aab-android.yml → .github/workflows/build-android.yml

@@ -1,10 +1,14 @@
-name: Build AAB for Play Store
+name: Build Android
 
 on:
-  workflow_dispatch:
+  push:
+    branches:
+      - main
 
 jobs:
   build:
+    name: Build & Upload to Play Store
+    if: github.repository == 'PapillonApp/Papillon'
     runs-on: ubuntu-latest
 
     steps:
@@ -15,23 +19,44 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 20
+          cache: npm
 
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '17'
+          distribution: temurin
+          java-version: 17
 
-      - name: Install deps
-        run: npm install --legacy-peer-deps || true
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Install dependencies
+        run: npm install --legacy-peer-deps
+
+      - name: Cache Expo prebuild
+        id: prebuild-cache
+        uses: actions/cache@v4
+        with:
+          path: android/
+          key: ${{ runner.os }}-expo-prebuild-${{ hashFiles('app.json', 'package-lock.json') }}
+          restore-keys: ${{ runner.os }}-expo-prebuild-
+
+      - name: Create secrets.json
+        run: |
+          echo '{
+            "APP_KEY": "${{ secrets.COUNTLY_APP_KEY }}",
+            "SALT": "${{ secrets.COUNTLY_SALT }}",
+            "SERVER_URL": "${{ secrets.COUNTLY_SERVER_URL }}"
+          }' > secrets.json
 
       - name: Prebuild Android
+        if: steps.prebuild-cache.outputs.cache-hit != 'true'
         run: npx expo prebuild --platform android --clean
 
       - name: Decode keystore
         run: echo "${{ secrets.KEYSTORE }}" | base64 --decode > android/app/release.keystore
 
-      - name: Calculate Android Version Code
+      - name: Calculate version code
         run: |
           VERSION_CODE=$(node -e "
             const version = require('./package.json').version;
@@ -40,42 +65,32 @@ jobs:
             console.log(cleanVersion * 100000 + runNumber);
           ")
           echo "VERSION_CODE=$VERSION_CODE" >> $GITHUB_ENV
-          echo "Computed VERSION_CODE: $VERSION_CODE"
 
       - name: Configure signing
         run: |
           sed -i '/signingConfigs {/a\        release {\n            storeFile file('\''release.keystore'\'')\n            storePassword '\''${{ secrets.KEYSTORE_PASSWORD }}'\''\n            keyAlias '\''${{ secrets.KEY_ALIAS }}'\''\n            keyPassword '\''${{ secrets.KEY_PASSWORD }}'\''\n        }' android/app/build.gradle
           sed -i 's/signingConfig signingConfigs.debug/signingConfig signingConfigs.release/' android/app/build.gradle
           sed -i "s/versionCode .*/versionCode ${{ env.VERSION_CODE }}/" android/app/build.gradle
-          echo "Signing config and version code configured in build.gradle"
 
       - name: Configure Gradle
         run: |
           chmod +x android/gradlew
           echo "org.gradle.jvmargs=-Xmx6144m -XX:MaxMetaspaceSize=1024m -XX:+HeapDumpOnOutOfMemoryError" >> android/gradle.properties
+          echo "org.gradle.parallel=true" >> android/gradle.properties
+          echo "org.gradle.caching=true" >> android/gradle.properties
+          echo "org.gradle.configuration-cache=true" >> android/gradle.properties
           echo "android.enable16KbPageSizes=true" >> android/gradle.properties
 
-      - name: Create secrets.json
-        run: |
-          echo '{
-            "APP_KEY": "${{ secrets.COUNTLY_APP_KEY }}",
-            "SALT": "${{ secrets.COUNTLY_SALT }}",
-            "SERVER_URL": "${{ secrets.COUNTLY_SERVER_URL }}"
-          }' > secrets.json
-
       - name: Build AAB
-        run: |
-          cd android
-          ./gradlew bundleRelease --no-daemon
+        run: cd android && ./gradlew bundleRelease --no-daemon
 
-      - name: Upload AAB
+      - name: Upload AAB artifact
         uses: actions/upload-artifact@v4
         with:
           name: app-release.aab
           path: android/app/build/outputs/bundle/release/*.aab
 
-      - name: Upload on Play Store on beta track
-        if: success()
+      - name: Upload to Play Store
         uses: r0adkll/upload-google-play@v1
         with:
           serviceAccountJsonPlainText: ${{ secrets.PLAY_STORE_KEY }}

.github/workflows/merge.yml

@@ -0,0 +1,35 @@
+name: Merge dev into main
+
+on:
+  workflow_dispatch:
+
+jobs:
+  merge:
+    name: Merge
+    if: github.repository == 'PapillonApp/Papillon'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Generate app token
+        id: app-token
+        uses: actions/create-github-app-token@v3
+        with:
+          app-id: ${{ vars.APP_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          token: ${{ steps.app-token.outputs.token }}
+          fetch-depth: 0
+
+      - name: Configure git
+        run: |
+          git config user.name "papillon-release[bot]"
+          git config user.email "papillon-release[bot]@users.noreply.github.com"
+
+      - name: Merge dev into main
+        run: |
+          git checkout main
+          git merge origin/dev --no-edit
+          git push origin main