CI: remove onedrive hacks

Signed-off-by: Tianling Shen <[email protected]>
kenzok78 · Jun 16, 2023 · aeb5434 · aeb5434
1 parent 5c65211
commit aeb5434
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 73 deletions.
diff --git a/.github/workflows/update-mirror.yml b/.github/workflows/update-mirror.yml
@@ -54,14 +54,6 @@ jobs:
           make download -j8
           find dl -size -1024c -exec rm -f {} \;
 
-      - name: Fetch Cached Uploaded Files List
-        uses: actions/cache@v3
-        with:
-          path: "uploaded-files"
-          key: immortalwrt-mirror-uploaded-${{ matrix.branch }}-${{ github.run_id }}
-          restore-keys: |
-            immortalwrt-mirror-uploaded-
-
       - name: Fetch Cached Uploader Keys
         uses: actions/cache@v3
         with:
@@ -95,11 +87,10 @@ jobs:
           UPLOADER_TYPE: "onedrive"
           UPLOADER_CONF: "uploader.json"
         run: |
-          ./uploader-cache/detect-upload-files.sh
-          [ "$(ls -A "package-sources"/* | wc -l)" -gt "0" ] || exit 0
+          mkdir -p package-sources
+          for i in $(cat "sourcelist"); do mv "immortalwrt/dl/$i" "package-sources/"; done
           [ -f "uploader-keys/$UPLOADER_TYPE.json" ] && cp -f "uploader-keys/$UPLOADER_TYPE.json" "$UPLOADER_CONF" || ./onedrive-uploader/gen-onedriveconf.sh
           ./onedrive-uploader/OneDriveUploader -f -c "$UPLOADER_CONF" -s "package-sources" -r "/" -skip
-          ./uploader-cache/gen-downloaded-hash.sh
           [ -d "uploader-keys" ] || mkdir -p "uploader-keys"
           cp -f "$UPLOADER_CONF" "uploader-keys/$UPLOADER_TYPE.json"
 

diff --git a/uploader-cache/detect-upload-files.sh b/uploader-cache/detect-upload-files.sh
diff --git a/uploader-cache/gen-downloaded-hash.sh b/uploader-cache/gen-downloaded-hash.sh