From cf6a2dec3f7eb280276799e090fda1bdf0203cea Mon Sep 17 00:00:00 2001
From: neil <neil@neils-MacBook-Pro.local>
Date: Mon, 2 Jan 2023 12:40:34 +0800
Subject: [PATCH] test regular build process

---
 .github/workflows/m1.yml | 93 ++++++++++++++++++++--------------------
 package.json             |  2 +-
 2 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/.github/workflows/m1.yml b/.github/workflows/m1.yml
index 126c1a3..8209f4b 100644
--- a/.github/workflows/m1.yml
+++ b/.github/workflows/m1.yml
@@ -25,58 +25,57 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    # - uses: teaxyz/setup@v0
-    #   env:
-    #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    #     ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE_P12 }}
-    #     APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE_P12 }}
-    #     APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_P12_PASSWORD }}
-    #     APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
-    #     APPLE_ID: ${{ secrets.APPLE_ID }}
-    #     APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
-    #   with:
-    #     target: build
-
-    # - name: zip app
-    #   run: |
-    #     cd ./modules/gui/src-tauri/target/release/bundle/macos/ && zip -r tea.zip tea.app
-
-    # - uses: aws-actions/configure-aws-credentials@v1
-    #   with:
-    #     aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-    #     aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-    #     aws-region: us-east-1
-
-    # - name: cp package images from prod to preview bucket
-    #   run: |
-    #     aws s3 cp ./modules/gui/src-tauri/target/release/bundle/macos/tea.zip "s3://preview.gui.tea.xyz/release/tea.zip"
-    - name: setup node
-      uses: actions/setup-node@v2
+    - uses: teaxyz/setup@v0
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE_P12 }}
+        APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE_P12 }}
+        APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_P12_PASSWORD }}
+        APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
       with:
-        node-version: 16
-    - name: install Rust stable
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: stable
-    - uses: pnpm/action-setup@v2
-      with:
-        version: 7.18.2
-        run_install: true
-  
-    # - uses: apple-actions/import-codesign-certs@d54750db52a4d3eaed0fc107a8bab3958f3f7494
-    #   with:
-    #     p12-file-base64: ${{ secrets.APPLE_CERTIFICATE_P12 }}
-    #     p12-password: ${{ secrets.APPLE_CERTIFICATE_P12_PASSWORD }}
-    - run: pnpm build:gui
-
-    - name: Codesign package
-      run: |
-        codesign -s "Developer ID Application: Tea Inc. (7WV56FL599)" -v --force --deep --timestamp --preserve-metadata=entitlements -o runtime ./modules/gui/src-tauri/target/release/bundle/macos/tea.app || true
+        target: build
 
     - name: zip app
       run: |
         cd ./modules/gui/src-tauri/target/release/bundle/macos/ && zip -r tea.zip tea.app
 
+    - uses: aws-actions/configure-aws-credentials@v1
+      with:
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        aws-region: us-east-1
+
     - name: cp package images from prod to preview bucket
       run: |
-        aws s3 cp ./modules/gui/src-tauri/target/release/bundle/macos/tea.zip "s3://preview.gui.tea.xyz/release/tea.zip"
\ No newline at end of file
+        aws s3 cp ./modules/gui/src-tauri/target/release/bundle/macos/tea.zip "s3://preview.gui.tea.xyz/release/tea.zip"
+
+    # - name: setup node
+    #   uses: actions/setup-node@v2
+    #   with:
+    #     node-version: 16
+    # - name: install Rust stable
+    #   uses: actions-rs/toolchain@v1
+    #   with:
+    #     toolchain: stable
+    # - uses: pnpm/action-setup@v2
+    #   with:
+    #     version: 7.18.2
+    #     run_install: true
+  
+    # # - uses: apple-actions/import-codesign-certs@d54750db52a4d3eaed0fc107a8bab3958f3f7494
+    # #   with:
+    # #     p12-file-base64: ${{ secrets.APPLE_CERTIFICATE_P12 }}
+    # #     p12-password: ${{ secrets.APPLE_CERTIFICATE_P12_PASSWORD }}
+    # - run: pnpm build:gui
+
+    # - name: Codesign package
+    #   run: |
+    #     codesign -s "Developer ID Application: Tea Inc. (7WV56FL599)" -v --force --deep --timestamp --preserve-metadata=entitlements -o runtime ./modules/gui/src-tauri/target/release/bundle/macos/tea.app || true
+
+    # - name: zip app
+    #   run: |
+    #     cd ./modules/gui/src-tauri/target/release/bundle/macos/ && zip -r tea.zip tea.app
+
+    # - name: cp package images from prod to preview bucket
+    #   run: |
+    #     aws s3 cp ./modules/gui/src-tauri/target/release/bundle/macos/tea.zip "s3://preview.gui.tea.xyz/release/tea.zip"
\ No newline at end of file
diff --git a/package.json b/package.json
index 05ee493..5f005a0 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
     "private": true,
     "scripts": {
         "release": "sh ./.github/update-latest-binary.sh",
-        "build:gui": "pnpm --filter gui exec tauri build -b app --verbose",
+        "build:gui": "pnpm --filter gui exec tauri build --verbose",
         "dev:gui": "pnpm --filter gui exec tauri dev",
         "web:gui": "BUILD_FOR=preview pnpm --filter gui dev"
     },