From 0ed034ccfe93132ca4ce6d2fa8ab48339f5e72b7 Mon Sep 17 00:00:00 2001 From: "firedcto@gmail.com" Date: Fri, 15 Nov 2024 16:45:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9B=B4=E6=96=B0=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 29 +++++++++++++++++++++++ .github/workflows/sync_coding_net.yml | 34 --------------------------- launcher.json | 6 ++--- 3 files changed, 32 insertions(+), 37 deletions(-) delete mode 100644 .github/workflows/sync_coding_net.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5c3aa1e..ebb01a5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,6 +36,35 @@ jobs: python -m pip install --upgrade pip pip install -r requirements.txt + - name: Copy ok-script lib + run: | + python -m ok.update.copy_ok_folder + + - name: amend git to add ok-script + run: | + git add ok/ + git commit --amend --no-edit + + - name: Set up coding Git credentials + env: + CODING_USERNAME: ${{ secrets.CODING_USERNAME }} + CODING_PASSWORD: ${{ secrets.CODING_PASSWORD }} + run: | + git config --global credential.helper store + echo "https://${CODING_USERNAME}:${CODING_PASSWORD}@e.coding.net" > ~/.git-credentials + + - name: Push to Coding.net + run: | + git remote add coding https://e.coding.net/g-frfh1513/ok-wuthering-waves/ok-wuthering-waves.git + git push coding --force + + - name: Push to GitHub update + run: | + git remote add gitupdate https://github.com/ok-oldking/ok-ww-update.git + git push gitupdate --force + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Build Executable run: | echo "tag: ${{ steps.changes.outputs.tag }}" diff --git a/.github/workflows/sync_coding_net.yml b/.github/workflows/sync_coding_net.yml deleted file mode 100644 index c9b05c2..0000000 --- a/.github/workflows/sync_coding_net.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: Clone and Push to Coding.net - -on: - push: - branches: - - '**' - -jobs: - clone-and-push: - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - with: - fetch-depth: 0 # Fetch all history for all branches and tags - - - name: Clone GitHub repository - run: | - git clone --mirror https://github.com/ok-oldking/ok-wuthering-waves.git - cd ok-wuthering-waves.git - - - name: Set up Git credentials - env: - CODING_USERNAME: ${{ secrets.CODING_USERNAME }} - CODING_PASSWORD: ${{ secrets.CODING_PASSWORD }} - run: | - git config --global credential.helper store - echo "https://${CODING_USERNAME}:${CODING_PASSWORD}@e.coding.net" > ~/.git-credentials - - - name: Push to Coding.net - run: | - git remote add coding https://e.coding.net/g-frfh1513/ok-wuthering-waves/ok-wuthering-waves.git - git push coding --force diff --git a/launcher.json b/launcher.json index 598df5a..29530a1 100644 --- a/launcher.json +++ b/launcher.json @@ -6,7 +6,7 @@ "install_dependencies": [ "paddlepaddle-gpu==3.0.0b1 -i https://www.paddlepaddle.org.cn/packages/stable/cu123/", "PySide6-Fluent-Widgets>=1.5.5 --no-deps", - "paddleocr==2.8.1 ok-script pycaw psutil setuptools WMI>=1.5.1 typing-extensions>=4.11.0 numpy==1.26.4 opencv-contrib-python>=4.10.0.84" + "paddleocr==2.8.1 pycaw psutil setuptools WMI>=1.5.1 typing-extensions>=4.11.0 numpy==1.26.4 opencv-contrib-python>=4.10.0.84" ], "uninstall_dependencies": "rapidocr_openvino openvino", "target_size": 6070947351 @@ -16,9 +16,9 @@ "entry": "main.py", "install_dependencies": [ "PySide6-Fluent-Widgets>=1.5.5 --no-deps", - "rapidocr-openvino ok-script pycaw psutil WMI>=1.5.1 typing-extensions>=4.11.0 numpy==1.26.4 opencv-contrib-python>=4.10.0.84" + "rapidocr-openvino pycaw psutil WMI>=1.5.1 typing-extensions>=4.11.0 numpy==1.26.4 opencv-contrib-python>=4.10.0.84" ], - "uninstall_dependencies": "paddleocr", + "uninstall_dependencies": "paddleocr paddlepaddle-gpu", "target_size": 616621272 } ] \ No newline at end of file