From d30100635068e4ae8bb451f32d64a601ad0993c1 Mon Sep 17 00:00:00 2001
From: Nightsky <050644zf@outlook.com>
Date: Thu, 7 Nov 2024 10:53:44 +0800
Subject: [PATCH] Edit Actions

---
 .github/workflows/ASTRAutoUpdater.yml | 19 ++++++-
 .github/workflows/Weekly.yml          | 71 ---------------------------
 2 files changed, 17 insertions(+), 73 deletions(-)
 delete mode 100644 .github/workflows/Weekly.yml

diff --git a/.github/workflows/ASTRAutoUpdater.yml b/.github/workflows/ASTRAutoUpdater.yml
index 433b913..0e198b3 100644
--- a/.github/workflows/ASTRAutoUpdater.yml
+++ b/.github/workflows/ASTRAutoUpdater.yml
@@ -6,7 +6,10 @@ name: ASTR Auto Updater
 on:
   repository_dispatch:
     type: [update]
-
+  schedule:
+  - cron: 0 0 * * 1
+  # add manual trigger
+  workflow_dispatch:
     
 
 jobs:
@@ -39,13 +42,25 @@ jobs:
 
     - name: Updater
       run: |
-        python ./jsonconvert.py -q
+        if [ "${{ github.event_name }}" == "repository_dispatch" ]; then
+          python ./jsonconvert.py -q
+        else
+          python ./jsonconvert.py -q --all
+        fi
 
     - name: Push
       working-directory: ./ArknightsStoryJson
       run: |
         git push
 
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: changes-and-deletion
+        path: |
+          ./changes.txt
+          ./deletion.txt
+
     - name: Copy diff to tmp folder
       run: |
         bash ./copy_diff.sh
diff --git a/.github/workflows/Weekly.yml b/.github/workflows/Weekly.yml
deleted file mode 100644
index 059624e..0000000
--- a/.github/workflows/Weekly.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-# This workflow will install Python dependencies, run tests and lint with a single version of Python
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: ASTR Auto Updater (Weekly)
-
-on:
-  schedule:
-  - cron: 0 0 * * 1
-  # add manual trigger
-  workflow_dispatch:
-  
-    
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        repository: 050644zf/ASTR-Script
-        token: ${{secrets.PAT}} 
-    - uses: actions/checkout@v2
-      with:
-        repository: Kengxxiao/ArknightsGameData
-        path: ArknightsGameData
-    - uses: actions/checkout@v2
-      with:
-        repository: Kengxxiao/ArknightsGameData_YoStar
-        path: ArknightsGameData_YoStar
-    - uses: actions/checkout@v2
-      with:
-        repository: 050644zf/ArknightsStoryJson
-        path: ArknightsStoryJson
-        token: ${{secrets.PAT}}
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v2
-      with:
-        python-version: "3.8"
-
-    - name: Updater
-      run: |
-        python ./jsonconvert.py -q --all
-
-    - name: Push
-      working-directory: ./ArknightsStoryJson
-      run: |
-        git push
-
-    - name: Copy diff to tmp folder
-      run: |
-        bash ./copy_diff.sh
-
-    - name: Install AWS CLI
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y awscli        
-
-    - name: Configure AWS CLI for Cloudflare R2
-      run: |
-        aws configure set aws_access_key_id ${{ secrets.CLOUDFLARE_ACCESS_KEY_ID }}
-        aws configure set aws_secret_access_key ${{ secrets.CLOUDFLARE_SECRET_ACCESS_KEY }}
-        aws configure set default.region auto        
-
-    - name: Sync repository to Cloudflare R2
-      run: |
-        aws s3 sync . s3://${{ secrets.CLOUDFLARE_BUCKET_NAME }} --endpoint-url=https://${{ secrets.CLOUDFLARE_ACCOUNT_ID }}.r2.cloudflarestorage.com --exclude ".git/*"
-      env:
-        CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-      working-directory: ./tmp
\ No newline at end of file