From 53b7155b9bb33c818e6ad1cda6a64e4c38f6fe07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=81=8D=E5=85=AE=E6=83=9A=E5=85=AE?= <101191390+HIllya51@users.noreply.github.com> Date: Fri, 18 Oct 2024 20:40:26 +0800 Subject: [PATCH] ... --- .github/workflows/release.yml | 2 +- src/retrieval.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3cde12a1..45d8aff5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -43,7 +43,7 @@ jobs: - uses: actions/upload-artifact@v4 with: name: ${{ matrix.fname }} - path: build/${{ matrix.fname }}.zip + path: src/build/${{ matrix.fname }}.zip - name: loadversion id: loadversion diff --git a/src/retrieval.py b/src/retrieval.py index 954846fe..9bcd70a7 100644 --- a/src/retrieval.py +++ b/src/retrieval.py @@ -241,16 +241,16 @@ for f in collect: ff.write(bs) target = os.path.basename(targetdir) -if os.path.exists(rf"{targetdir}\..\{target}.zip"): - os.remove(rf"{targetdir}\..\{target}.zip") -if os.path.exists(rf"{targetdir}\..\{target}.7z"): - os.remove(rf"{targetdir}\..\{target}.7z") +if os.path.exists(rf"build\{target}.zip"): + os.remove(rf"build\{target}.zip") +if os.path.exists(rf"build\{target}.7z"): + os.remove(rf"build\{target}.7z") os.system( - rf'"C:\Program Files\7-Zip\7z.exe" a -m0=Deflate -mx9 {targetdir}\..\{target}.zip {targetdir}' + rf'"C:\Program Files\7-Zip\7z.exe" a -m0=Deflate -mx9 build\{target}.zip {targetdir}' ) if 0: os.system( - rf'"C:\Program Files\7-Zip\7z.exe" a -m0=LZMA2 -mx9 {targetdir}\..\{target}.7z {targetdir}' + rf'"C:\Program Files\7-Zip\7z.exe" a -m0=LZMA2 -mx9 build\{target}.7z {targetdir}' ) with open(r"C:\Program Files\7-Zip\7z.sfx", "rb") as ff: sfx = ff.read() @@ -261,10 +261,10 @@ if 0: ;!@InstallEnd@! """ - with open(rf"{targetdir}\..\{target}.7z", "rb") as ff: + with open(rf"build\{target}.7z", "rb") as ff: data = ff.read() - with open(rf"{targetdir}\..\{target}.exe", "wb") as ff: + with open(rf"build\{target}.exe", "wb") as ff: ff.write(sfx) ff.write(config.encode("utf8")) ff.write(data)