ci: Try to fix

Change-Id: I502575d710dd37a1a2ec2cbb43592feff8c623c1
calcitem · Jan 27, 2025 · 906cf02 · 906cf02
1 parent 99d258c
commit 906cf02
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 43 deletions.
diff --git a/.github/workflows/aab.yml b/.github/workflows/aab.yml
@@ -107,26 +107,20 @@ jobs:
         id: auth
         uses: google-github-actions/auth@v2
         with:
-          token_format: iam_json  # Obtain JSON format credentials
-          workload_identity_provider: "projects/391539675971/locations/global/workloadIdentityPools/github-pool/providers/github-provider"
+          workload_identity_provider: "projects/391539675971/locations/global/workloadIdentityPools/play-store-pool/providers/github-provider"
           service_account: "[email protected]"
-
-      # Write credentials to a temporary file
-      - name: Write credentials to file
-        run: |
-          echo "${{ steps.auth.outputs.credential_json }}" > /tmp/credentials.json
+          create_credentials_file: true
+          export_environment_variables: true
 
       # Upload to Google Play Store
       - name: Upload to Google Play Store
         uses: swootte/[email protected]
         with:
-          serviceAccountJson: /tmp/credentials.json  # Path to temporary credentials file
+          serviceAccountJson: ${{ steps.auth.outputs.credentials_file_path }}
           packageName: com.calcitem.sanmill
-          releaseFile: src/ui/flutter_app/build/app/outputs/bundle/release/app-release.aab
+          releaseFiles: src/ui/flutter_app/build/app/outputs/bundle/release/app-release.aab
           track: internal
           inAppUpdatePriority: 2
-          userFraction: 1.00
+          userFraction: 1.0
           whatsNewDirectory: distribution/whatsnew
           mappingFile: src/ui/flutter_app/build/app/outputs/mapping/release/mapping.txt
-          status: draft
-          changesNotSentForReview: true
diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
@@ -7,41 +7,24 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    name: Snapcraft Build
-    env:
-      SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_TOKEN }}
+    name: Snapcraft Build and Publish
     steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
-      - name: Install Snapcraft
-        uses: samuelmeuli/action-snapcraft@v3
+      - name: Build snap
+        id: snapcraft
+        uses: snapcore/action-build@v1
 
-      - name: Install LXD
-        run: |
-          sudo snap install lxd
-          sudo lxd init --auto
-
-      - name: Add GitHub Actions user to the lxd group
-        run: |
-          sudo usermod -aG lxd $(whoami)
-          newgrp lxd
-
-      - name: Verify LXD Installation
-        run: lxd --version
-
-      - name: Build snap using LXD
-        run: snapcraft --use-lxd
-
-      - name: List Snap Files
-        run: ls -la *.snap
-
-      - name: Upload Snap Artifact
+      - name: Upload snap artifact
         uses: actions/upload-artifact@v4
         with:
           name: snap
-          path: '*.snap'
+          path: ${{ steps.snapcraft.outputs.snap }}
 
-      - name: Install Snap Locally
-        run: |
-          sudo snap install --dangerous *.snap
+      - name: Publish snap to store
+        uses: snapcore/action-publish@v1
+        with:
+          snap: ${{ steps.snapcraft.outputs.snap }}
+          channels: edge
+        env:
+          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_TOKEN }}
diff --git a/distribution/whatsnew/en-US.txt b/distribution/whatsnew/en-US.txt
@@ -0,0 +1 @@
+Bug fixes and performance improvements.