ci: Tweak some more

frida · Jan 25, 2024 · ce7fcf6 · ce7fcf6
1 parent fd188cd
commit ce7fcf6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/actions/setup-windows-env/action.yml b/.github/actions/setup-windows-env/action.yml
@@ -9,7 +9,13 @@ runs:
   steps:
     - name: Activate Frida toolchain and SDK
       run: |
-        .\bootstrap.ps1 ${{ inputs.architecture }}
+        $arch = '${{ inputs.architecture }}'
+        .\bootstrap.ps1 $arch
+        $platforms = @{
+          x86 = 'Win32'
+          x86_64 = 'x64'
+        }
+        $platform = $platforms[$arch]
         (Resolve-Path 'toolchain-windows\bin').Path >> $Env:GITHUB_PATH
         echo PKG_CONFIG_PATH=$(Resolve-Path "sdk-windows\$platform-Release\lib\pkgconfig") >> $Env:GITHUB_ENV
       shell: pwsh

diff --git a/bootstrap.ps1 b/bootstrap.ps1
@@ -1,11 +1,5 @@
 $arch = $args[0]
 
-$platforms = @{
-  x86 = 'Win32'
-  x86_64 = 'x64'
-}
-$platform = $platforms[$arch]
-
 New-Item -Path 'build' -ItemType Directory -Force
 
 $deps_base_url = "https://build.frida.re/deps/20240123"