Merge branch 'dev' into fix-foreach-bug

TaYaKi71751 · Dec 30, 2023 · 0330a6b · 0330a6b
2 parents ec0a8c2 + e3c323c
commit 0330a6b
Show file tree

Hide file tree

Showing 18 changed files with 125 additions and 55,772 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,8 +1,8 @@
 name: Build android/ios
 on:
-  push:
-    branches: [ dev ]
-  workflow_dispatch:
+  pull_request:
+    branches:
+      - 'dev'
   merge_group:
 
 jobs:
@@ -11,7 +11,8 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
-          ref: dev
+          ref: ${{ github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
+
       - uses: subosito/flutter-action@v2
         with:
           # flutter-version: '2.5.2'
@@ -53,7 +54,8 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
-          ref: dev
+          ref: ${{ github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
+
       - uses: actions/setup-java@v1
         with:
           java-version: '12.x'

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -1,83 +1,80 @@
-name: Ci Pull Request
-on:
-  pull_request:
-  workflow_dispatch:
-  merge_group:
-    branches:
-    - dev
+# name: Ci Pull Request
+# on:
+#   pull_request:
+#   workflow_dispatch:
 
-jobs:
-  ios-build:
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
-      - uses: subosito/flutter-action@v2
-        with:
-          # flutter-version: '2.5.2'
-          channel: 'stable'
-      - uses: actions/setup-python@v2
-        with:
-          python-version: '3.8'
-      - name: Preprocess
-        run: | 
-          cd lib/server
-          echo 'String getValid(String vToken) { return vToken; }' >> salt.dart
-          cp salt.dart wsalt.dart
-          cd ../..
-          python3 preprocess-ios.py
-      - name: Podfile
-        run: |
-          cd ios
-          rm Podfile.lock
-          flutter clean
-          flutter pub get
-          pod install
-          pod update
-          cd ..
-      - name: Build
-        run: |
-          flutter build ios --release --no-codesign
-          mkdir -p Payload
-          mv ./build/ios/iphoneos/Runner.app Payload
-          zip -r -y Payload.zip Payload/Runner.app
-          mv Payload.zip Payload.ipa
-      - name: Upload IPA
-        uses: actions/upload-artifact@v2
-        with:
-          name: ipa-build
-          path: Payload.ipa
+# jobs:
+#   ios-build:
+#     runs-on: macos-latest
+#     steps:
+#       - uses: actions/checkout@v4
+#         with:
+#           ref: ${{ github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
+#       - uses: subosito/flutter-action@v2
+#         with:
+#           # flutter-version: '2.5.2'
+#           channel: 'stable'
+#       - uses: actions/setup-python@v2
+#         with:
+#           python-version: '3.8'
+#       - name: Preprocess
+#         run: | 
+#           cd lib/server
+#           echo 'String getValid(String vToken) { return vToken; }' >> salt.dart
+#           cp salt.dart wsalt.dart
+#           cd ../..
+#           python3 preprocess-ios.py
+#       - name: Podfile
+#         run: |
+#           cd ios
+#           rm Podfile.lock
+#           flutter clean
+#           flutter pub get
+#           pod install
+#           pod update
+#           cd ..
+#       - name: Build
+#         run: |
+#           flutter build ios --release --no-codesign
+#           mkdir -p Payload
+#           mv ./build/ios/iphoneos/Runner.app Payload
+#           zip -r -y Payload.zip Payload/Runner.app
+#           mv Payload.zip Payload.ipa
+#       - name: Upload IPA
+#         uses: actions/upload-artifact@v2
+#         with:
+#           name: ipa-build
+#           path: Payload.ipa
 
-  android-build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
-      - uses: actions/setup-java@v1
-        with:
-          java-version: '12.x'
-      - uses: subosito/flutter-action@v1
-        with:
-          # flutter-version: '2.5.2'
-          channel: 'stable'
-      - uses: actions/setup-python@v2
-        with:
-          python-version: '3.8'
-      - name: Preprocess
-        run: | 
-          cd lib/server
-          echo 'String getValid(String vToken) { return vToken; }' >> salt.dart
-          cp salt.dart wsalt.dart
-          cd ../..
-          python3 preprocess-android.py
-      - name: Build
-        run: |
-          flutter clean
-          flutter build apk --release
-      - name: Upload APK
-        uses: actions/upload-artifact@v2
-        with:
-          name: apk-build
-          path: ./build/app/outputs/apk/release/app-release.apk
+#   android-build:
+#     runs-on: ubuntu-latest
+#     steps:
+#       - uses: actions/checkout@v4
+#         with:
+#           ref: ${{ github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
+#       - uses: actions/setup-java@v1
+#         with:
+#           java-version: '12.x'
+#       - uses: subosito/flutter-action@v1
+#         with:
+#           # flutter-version: '2.5.2'
+#           channel: 'stable'
+#       - uses: actions/setup-python@v2
+#         with:
+#           python-version: '3.8'
+#       - name: Preprocess
+#         run: | 
+#           cd lib/server
+#           echo 'String getValid(String vToken) { return vToken; }' >> salt.dart
+#           cp salt.dart wsalt.dart
+#           cd ../..
+#           python3 preprocess-android.py
+#       - name: Build
+#         run: |
+#           flutter clean
+#           flutter build apk --release
+#       - name: Upload APK
+#         uses: actions/upload-artifact@v2
+#         with:
+#           name: apk-build
+#           path: ./build/app/outputs/apk/release/app-release.apk