diff --git a/.github/scripts/build_lunahook.py b/.github/scripts/build_lunahook.py index 5b836b20..413770e6 100644 --- a/.github/scripts/build_lunahook.py +++ b/.github/scripts/build_lunahook.py @@ -19,11 +19,14 @@ if len(sys.argv) and sys.argv[1] == "merge": os.mkdir("../build") os.mkdir("builds") language = ["Chinese", "English", "Russian", "TradChinese"] - bits = [32, 64] for lang in language: - for bit in bits: - shutil.copytree( - f"build/{lang}_{bit}/Release_{lang}", + shutil.copytree( + f"build/{lang}_64/Release_{lang}", + f"../build/Release_{lang}", + dirs_exist_ok=True, + ) + shutil.copytree( + f"build/{lang}_winxp/Release_{lang}_winxp", f"../build/Release_{lang}", dirs_exist_ok=True, ) diff --git a/.github/workflows/buildlunahook.yml b/.github/workflows/buildlunahook.yml index 03a025a4..afa6b50e 100644 --- a/.github/workflows/buildlunahook.yml +++ b/.github/workflows/buildlunahook.yml @@ -25,13 +25,7 @@ jobs: - uses: actions/upload-artifact@v4 with: name: ${{ matrix.language }}_winxp - path: cpp/LunaHook/builds/Release_${{ matrix.language }}_winxp.zip - - uses: softprops/action-gh-release@v2 - with: - tag_name: LunaHook - files: cpp/LunaHook/builds/Release_${{ matrix.language }}_winxp.zip - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + path: cpp/LunaHook/builds build_plugin: runs-on: windows-latest @@ -84,7 +78,7 @@ jobs: strategy: matrix: language: [Chinese,English,Russian,TradChinese] - bits: [32, 64] + bits: [64] permissions: id-token: write attestations: write @@ -105,7 +99,7 @@ jobs: build: runs-on: windows-latest - needs: [build_x] + needs: [build_x,build_xp] steps: - uses: actions/checkout@v4 - uses: actions/download-artifact@v4