From 93386477735709c1ef1b470d34aa1080c8f35e57 Mon Sep 17 00:00:00 2001
From: Calcitem <calcitem@outlook.com>
Date: Mon, 27 Jan 2025 18:30:20 +0800
Subject: [PATCH] ci: Try to fix

Change-Id: I502575d710dd37a1a2ec2cbb43592feff8c623c1
---
 .github/workflows/aab.yml       | 13 +++++--------
 .github/workflows/snap.yml      | 11 ++---------
 distribution/whatsnew/en-US.txt |  1 +
 3 files changed, 8 insertions(+), 17 deletions(-)
 create mode 100644 distribution/whatsnew/en-US.txt

diff --git a/.github/workflows/aab.yml b/.github/workflows/aab.yml
index 4c33e210d..399fabbd9 100644
--- a/.github/workflows/aab.yml
+++ b/.github/workflows/aab.yml
@@ -107,20 +107,16 @@ 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: "play-store-publisher@sanmill-app.iam.gserviceaccount.com"
-
-      # 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/upload-google-play@v1.0.13
         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
           track: internal
@@ -130,3 +126,4 @@ jobs:
           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
index e8e09d315..7b70530ae 100644
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -22,16 +22,9 @@ jobs:
           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
+        run: |
+          sg lxd -c 'snapcraft --use-lxd'
 
       - name: List Snap Files
         run: ls -la *.snap
diff --git a/distribution/whatsnew/en-US.txt b/distribution/whatsnew/en-US.txt
new file mode 100644
index 000000000..2e531b654
--- /dev/null
+++ b/distribution/whatsnew/en-US.txt
@@ -0,0 +1 @@
+Bug fixes and performance improvements.