diff --git a/.github/scripts/packlunahook.py b/.github/scripts/packlunahook.py index e821d99a..12807538 100644 --- a/.github/scripts/packlunahook.py +++ b/.github/scripts/packlunahook.py @@ -7,11 +7,11 @@ if not rootDir: rootDir=os.path.abspath(os.path.join(rootDir,'../../cpp/LunaHook')) os.chdir(rootDir) -for f in os.listdir("../builds"): - if os.path.isdir("../builds/" + f) == False: +for f in os.listdir("builds"): + if os.path.isdir("builds/" + f) == False: continue - for dirname, _, fs in os.walk("../builds/" + f): + for dirname, _, fs in os.walk("builds/" + f): if ( dirname.endswith("translations") or dirname.endswith("translations") @@ -31,8 +31,8 @@ for f in os.listdir("../builds"): "D3Dcompiler_47.dll", ]: os.remove(path) - targetdir = "../builds/" + f - target = "../builds/" + f + ".zip" + targetdir = "builds/" + f + target = "builds/" + f + ".zip" os.system( rf'"C:\Program Files\7-Zip\7z.exe" a -m0=Deflate -mx9 {target} {targetdir}' ) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dd932231..a4129bad 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,9 +2,9 @@ name: build on: push: - paths: [ '.github/workflows/build.yml','py/**'] + paths: [ '.github/scripts','.github/workflows/build.yml','py/**'] pull_request: - paths: [ '.github/workflows/build.yml','py/**'] + paths: [ '.github/scripts','.github/workflows/build.yml','py/**'] jobs: buildluna: diff --git a/.github/workflows/buildluna.yml b/.github/workflows/buildluna.yml index 0907152f..3ffbc950 100644 --- a/.github/workflows/buildluna.yml +++ b/.github/workflows/buildluna.yml @@ -18,7 +18,7 @@ jobs: - uses: GuillaumeFalourd/setup-windows10-sdk-action@v2 with: sdk-version: 22621 - - run: python cpp/LunaHook/build.py build English ${{matrix.bits}} 1 + - run: python .github/scripts/build.py build English ${{matrix.bits}} 1 - uses: actions/upload-artifact@v4 with: diff --git a/.github/workflows/buildlunahook.yml b/.github/workflows/buildlunahook.yml index 8b66b77d..f4f653eb 100644 --- a/.github/workflows/buildlunahook.yml +++ b/.github/workflows/buildlunahook.yml @@ -1,9 +1,9 @@ name: buildlunahook on: push: - paths: [ '.github/workflows/buildlunahook.yml','cpp/LunaHook/**'] + paths: [ '.github/scripts','.github/workflows/buildlunahook.yml','cpp/LunaHook/**'] pull_request: - paths: [ '.github/workflows/buildlunahook.yml','cpp/LunaHook/**'] + paths: [ '.github/scripts','.github/workflows/buildlunahook.yml','cpp/LunaHook/**'] jobs: build_xp: