From be496aca8a60d155e368ec89f0aa8ac4459a0466 Mon Sep 17 00:00:00 2001 From: Hans5958 Date: Thu, 10 Oct 2024 18:46:32 +0700 Subject: [PATCH] Debugging cmd run 1 --- .github/workflows/ForceNightlyDeploy.yml | 2 +- .github/workflows/NightlyDeploy.yml | 2 +- .github/workflows/PushCheck.yml | 56 ++++++++++++++---------- .github/workflows/ReleaseDeploy.yml | 2 +- _script/compile-2.sh | 22 ++++++---- 5 files changed, 50 insertions(+), 34 deletions(-) diff --git a/.github/workflows/ForceNightlyDeploy.yml b/.github/workflows/ForceNightlyDeploy.yml index 8967a00..848b7f5 100644 --- a/.github/workflows/ForceNightlyDeploy.yml +++ b/.github/workflows/ForceNightlyDeploy.yml @@ -5,7 +5,7 @@ name: Force Nightly Deployment jobs: deploy: name: Deployment - runs-on: windows-latest + runs-on: windows-2019 if: github.actor == github.event.repository.owner.login defaults: run: diff --git a/.github/workflows/NightlyDeploy.yml b/.github/workflows/NightlyDeploy.yml index 486a61d..cfe7954 100644 --- a/.github/workflows/NightlyDeploy.yml +++ b/.github/workflows/NightlyDeploy.yml @@ -7,7 +7,7 @@ name: Nightly Deployment jobs: deploy: name: Deployment - runs-on: windows-latest + runs-on: windows-2019 defaults: run: shell: bash diff --git a/.github/workflows/PushCheck.yml b/.github/workflows/PushCheck.yml index 9b6a899..f759f1e 100644 --- a/.github/workflows/PushCheck.yml +++ b/.github/workflows/PushCheck.yml @@ -37,8 +37,16 @@ jobs: runs-on: windows-latest defaults: run: - shell: bash + shell: wsl-bash {0} steps: + + - uses: Vampire/setup-wsl@v3 + with: + additional-packages: p7zip-full jq python3.10 + wsl-conf: | + [automount] + enabled=true + root=/mnt/ # - name: Calculate depth # id: depth @@ -60,36 +68,38 @@ jobs: # echo "Some files translated. Continuing." # fi - - name: Install required packages - run: choco install reshack + # - name: Install required packages + # shell: cmd + # run: choco install reshack - name: Build id: build run: | cd _script + pwd bash workflow/build-all-artifact.sh - - name: Upload artifact (v1.43) - uses: actions/upload-artifact@v4 - with: - name: Domino143_Translated_v${{steps.build.outputs.VERSION_NUM}}-artifact.${{steps.build.outputs.BUILD_DATE}} - path: _script/dist/Domino143_Translated/ + # - name: Upload artifact (v1.43) + # uses: actions/upload-artifact@v4 + # with: + # name: Domino143_Translated_v${{steps.build.outputs.VERSION_NUM}}-artifact.${{steps.build.outputs.BUILD_DATE}} + # path: _script/dist/Domino143_Translated/ - - name: Upload artifact (v1.44) - uses: actions/upload-artifact@v4 - with: - name: Domino144_Translated_v${{steps.build.outputs.VERSION_NUM}}-artifact.${{steps.build.outputs.BUILD_DATE}} - path: _script/dist/Domino144_Translated/ + # - name: Upload artifact (v1.44) + # uses: actions/upload-artifact@v4 + # with: + # name: Domino144_Translated_v${{steps.build.outputs.VERSION_NUM}}-artifact.${{steps.build.outputs.BUILD_DATE}} + # path: _script/dist/Domino144_Translated/ - - name: Upload artifact (v1.45, 32-bit) - uses: actions/upload-artifact@v4 - with: - name: Domino145_dev007_x86_Translated_v${{steps.build.outputs.VERSION_NUM}}-artifact.${{steps.build.outputs.BUILD_DATE}} - path: _script/dist/Domino145_dev007_x86_Translated/ + # - name: Upload artifact (v1.45, 32-bit) + # uses: actions/upload-artifact@v4 + # with: + # name: Domino145_dev007_x86_Translated_v${{steps.build.outputs.VERSION_NUM}}-artifact.${{steps.build.outputs.BUILD_DATE}} + # path: _script/dist/Domino145_dev007_x86_Translated/ - - name: Upload artifact (v1.45, 64-bit) - uses: actions/upload-artifact@v4 - with: - name: Domino145_dev007_x64_Translated_v${{steps.build.outputs.VERSION_NUM}}-artifact.${{steps.build.outputs.BUILD_DATE}} - path: _script/dist/Domino145_dev007_x64_Translated/ + # - name: Upload artifact (v1.45, 64-bit) + # uses: actions/upload-artifact@v4 + # with: + # name: Domino145_dev007_x64_Translated_v${{steps.build.outputs.VERSION_NUM}}-artifact.${{steps.build.outputs.BUILD_DATE}} + # path: _script/dist/Domino145_dev007_x64_Translated/ diff --git a/.github/workflows/ReleaseDeploy.yml b/.github/workflows/ReleaseDeploy.yml index 1897828..2f18128 100644 --- a/.github/workflows/ReleaseDeploy.yml +++ b/.github/workflows/ReleaseDeploy.yml @@ -5,7 +5,7 @@ name: Release Deployment jobs: deploy: name: Deployment - runs-on: windows-latest + runs-on: windows-2019 if: github.actor == github.event.repository.owner.login defaults: run: diff --git a/_script/compile-2.sh b/_script/compile-2.sh index 0bd2a94..86fb1fd 100644 --- a/_script/compile-2.sh +++ b/_script/compile-2.sh @@ -49,15 +49,21 @@ Log= CON -add VersionInfo.res, VERSIONINFO,, -add 240.res, 240,, " > tmp.txt -echo '"C:\Program Files (x86)\Resource Hacker\ResourceHacker.exe" -open Dialog.rc -save Dialog.res -action compile -log CON -"C:\Program Files (x86)\Resource Hacker\ResourceHacker.exe" -open Menu.rc -save Menu.res -action compile -log CON -"C:\Program Files (x86)\Resource Hacker\ResourceHacker.exe" -open StringTable.rc -save StringTable.res -action compile -log CON -"C:\Program Files (x86)\Resource Hacker\ResourceHacker.exe" -open VersionInfo.rc -save VersionInfo.res -action compile -log CON + +ls -l "/mnt" +ls -l "/mnt/c" +ls -l "/mnt/c/Program Files (x86)" +ls -l "/mnt/c/Program Files (x86)/Resource Hacker" + +"/mnt/c/Program Files (x86)/Resource Hacker/ResourceHacker.exe" -open Dialog.rc -save Dialog.res -action compile -log CON +"/mnt/c/Program Files (x86)/Resource Hacker/ResourceHacker.exe" -open Menu.rc -save Menu.res -action compile -log CON +"/mnt/c/Program Files (x86)/Resource Hacker/ResourceHacker.exe" -open StringTable.rc -save StringTable.res -action compile -log CON +"/mnt/c/Program Files (x86)/Resource Hacker/ResourceHacker.exe" -open VersionInfo.rc -save VersionInfo.res -action compile -log CON cd 240 -"C:\Program Files (x86)\Resource Hacker\ResourceHacker.exe" -open _240.rc -save ../240.res -action compile -log CON -cd.. -"C:\Program Files (x86)\Resource Hacker\ResourceHacker.exe" -script tmp.txt' > tmp.bat -cmd.exe /c tmp.bat +"/mnt/c/Program Files (x86)/Resource Hacker/ResourceHacker.exe" -open _240.rc -save ../240.res -action compile -log CON +cd .. +"/mnt/c/Program Files (x86)/Resource Hacker/ResourceHacker.exe" -script tmp.txt + touch $EXECUTABLE_NAME echo "Compilation done!"