Try to fix #673

YT-Advanced · Oct 9, 2023 · b612a2e · b612a2e
1 parent 6997b77
commit b612a2e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -96,7 +96,7 @@ jobs:
           fail-on-cache-miss: true
 
       - name: Merge language and density resources 🧙🏻‍♂️
-        run: (Start-Process pwsh.exe -NoNewWindow -PassThru -Args "-ExecutionPolicy Bypass -File MakePri.ps1" -WorkingDirectory "${{ github.workspace }}\output\${{ needs.build.outputs.zipname }}").WaitForExit()
+        run: (Start-Process pwsh.exe -NoNewWindow -PassThru -Args "-ExecutionPolicy Bypass -File MakePri.ps1 -Args ${{ inputs.arch }}" -WorkingDirectory "${{ github.workspace }}\output\${{ needs.build.outputs.zipname }}").WaitForExit()
 
       - name: Compact Images 💿
         run: |

diff --git a/.github/workflows/comment_on_issues.yml b/.github/workflows/comment_on_issues.yml
@@ -237,6 +237,7 @@ jobs:
 
     outputs:
       artifact: ${{ steps.wsa.outputs.artifact }}
+      arch: ${{ steps.wsa.outputs.arch }}
       file_ext: ${{ steps.wsa.outputs.file_ext }}
       comment-id: ${{ steps.comment.outputs.comment-id }}
 
@@ -257,7 +258,7 @@ jobs:
           fail-on-cache-miss: true
 
       - name: Merge language and density resources
-        run: (Start-Process pwsh.exe -NoNewWindow -PassThru -Args "-ExecutionPolicy Bypass -File MakePri.ps1" -WorkingDirectory "${{ github.workspace }}\output\${{ needs.build.outputs.artifact }}").WaitForExit()
+        run: (Start-Process pwsh.exe -NoNewWindow -PassThru -Args "-ExecutionPolicy Bypass -File MakePri.ps1 -Args ${{ needs.build.outputs.arch }}" -WorkingDirectory "${{ github.workspace }}\output\${{ needs.build.outputs.artifact }}").WaitForExit()
 
       - name: Compact Images 💿
         run: |

diff --git a/.github/workflows/custom_build.yml b/.github/workflows/custom_build.yml
@@ -131,7 +131,7 @@ jobs:
           fail-on-cache-miss: true
 
       - name: Merge language and density resources 🧙🏻‍♂️
-        run: (Start-Process pwsh.exe -NoNewWindow -PassThru -Args "-ExecutionPolicy Bypass -File MakePri.ps1" -WorkingDirectory "${{ github.workspace }}\output\${{ needs.build.outputs.artifact }}").WaitForExit()
+        run: (Start-Process pwsh.exe -NoNewWindow -PassThru -Args "-ExecutionPolicy Bypass -File MakePri.ps1 -Args ${{ inputs.arch }}" -WorkingDirectory "${{ github.workspace }}\output\${{ needs.build.outputs.artifact }}").WaitForExit()
 
       - name: Compact Images 💿
         run: |

diff --git a/installer/MakePri.ps1 b/installer/MakePri.ps1
@@ -16,7 +16,7 @@
 # Copyright (C) 2023 LSPosed Contributors
 #
 
-$MakePri = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x64\makepri.exe"
+$MakePri = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\$args[0]\makepri.exe"
 
 New-Item -Path "." -Name "priinfo" -ItemType "directory" | Out-Null
 Copy-Item .\resources.pri -Destination ".\pri\resources.pri" | Out-Null

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -789,6 +789,7 @@ echo -e "\nFinishing building...."
 mkdir -p "$OUTPUT_DIR"
 OUTPUT_PATH="${OUTPUT_DIR:?}/$artifact_name"
 mv "$WORK_DIR/wsa/$ARCH" "$WORK_DIR/wsa/$artifact_name"
+echo "arch=${ARCH}" >> "$GITHUB_OUTPUT"
 echo "file_ext=.${COMPRESS_FORMAT}" >> "$GITHUB_OUTPUT"
 if [[ "$COMPRESS_FORMAT" = "7z" && -z $AFTER_COMPRESS ]]; then
     echo "Compressing with 7-Zip"