fix!: placement of python dependencies on disk, add debug flag (#17)

extism · Oct 23, 2024 · b45d968 · b45d968
1 parent b70c5df
commit b45d968
Show file tree

Hide file tree

Showing 10 changed files with 4,626 additions and 35 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: default
-          toolchain: stable
+          toolchain: 1.81.0
           target: wasm32-wasi
           default: true
 
@@ -36,10 +36,10 @@ jobs:
           go install github.com/extism/cli/[email protected]
           cd /tmp
           # get just wasm-merge and wasm-opt
-          curl -L https://github.com/WebAssembly/binaryen/releases/download/version_116/binaryen-version_116-x86_64-linux.tar.gz > binaryen.tar.gz
+          curl -L https://github.com/WebAssembly/binaryen/releases/download/version_117/binaryen-version_117-x86_64-linux.tar.gz > binaryen.tar.gz
           tar xvzf binaryen.tar.gz
-          sudo cp binaryen-version_116/bin/wasm-merge /usr/local/bin
-          sudo cp binaryen-version_116/bin/wasm-opt /usr/local/bin
+          sudo cp binaryen-version_117/bin/wasm-merge /usr/local/bin
+          sudo cp binaryen-version_117/bin/wasm-opt /usr/local/bin
         if: runner.os != 'Windows'
 
       - name: Update deps (Windows)
@@ -48,11 +48,11 @@ jobs:
           go install github.com/extism/cli/extism@c1eb1fc
           Remove-Item -Recurse -Path "c:\Program files\Binaryen" -Force -ErrorAction SilentlyContinue > $null 2>&1
           New-Item -ItemType Directory -Force -Path "c:\Program files\Binaryen" -ErrorAction Stop > $null 2>&1
-          Invoke-WebRequest -Uri "https://github.com/WebAssembly/binaryen/releases/download/version_116/binaryen-version_116-x86_64-windows.tar.gz" -OutFile "$env:TMP\binaryen-version_116-x86_64-windows.tar.gz"
-          7z x "$env:TMP\binaryen-version_116-x86_64-windows.tar.gz" -o"$env:TMP\" >$null  2>&1
-          7z x -ttar "$env:TMP\binaryen-version_116-x86_64-windows.tar" -o"$env:TMP\" >$null  2>&1
-          Copy-Item -Path "$env:TMP\binaryen-version_116\bin\wasm-opt.exe" -Destination "c:\Program files\Binaryen" -ErrorAction Stop > $null 2>&1
-          Copy-Item -Path "$env:TMP\binaryen-version_116\bin\wasm-merge.exe" -Destination "c:\Program files\Binaryen" -ErrorAction Stop > $null 2>&1
+          Invoke-WebRequest -Uri "https://github.com/WebAssembly/binaryen/releases/download/version_116/binaryen-version_117-x86_64-windows.tar.gz" -OutFile "$env:TMP\binaryen-version_116-x86_64-windows.tar.gz"
+          7z x "$env:TMP\binaryen-version_117-x86_64-windows.tar.gz" -o"$env:TMP\" >$null  2>&1
+          7z x -ttar "$env:TMP\binaryen-version_117-x86_64-windows.tar" -o"$env:TMP\" >$null  2>&1
+          Copy-Item -Path "$env:TMP\binaryen-version_117\bin\wasm-opt.exe" -Destination "c:\Program files\Binaryen" -ErrorAction Stop > $null 2>&1
+          Copy-Item -Path "$env:TMP\binaryen-version_117\bin\wasm-merge.exe" -Destination "c:\Program files\Binaryen" -ErrorAction Stop > $null 2>&1
         if: runner.os == 'Windows'
 
       - name: Run Tests (Linux)

diff --git a/.github/workflows/ci_install.yml b/.github/workflows/ci_install.yml
@@ -20,10 +20,15 @@ jobs:
     - name: Test Install Script
       run: |
         bash ./install.sh
+      if: runner.os != 'Windows'
+
+    - name: Test Installation
+      run: |
         which extism-py
         extism-py --version
       if: runner.os != 'Windows'
 
+
     # - name: Test Install Script Part1 (Windows)
     #   run: |
     #     powershell -executionpolicy bypass -File .\install-windows.ps1

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -17,7 +17,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: default
-          toolchain: stable
+          toolchain: 1.81.0
           target: wasm32-wasi
           default: true
 
@@ -132,7 +132,7 @@ jobs:
         run: cd bin && cargo build --release --target ${{ matrix.target }} --package extism-py
 
       - name: Create directory structure
-        run: mkdir -p extism-py/bin extism-py/share && mv wasi-deps/usr extism-py/share/extism-py && mv ${{ matrix.path }} extism-py/bin/
+        run: mkdir -p extism-py/bin extism-py/share && mv wasi-deps extism-py/share/extism-py && mv ${{ matrix.path }} extism-py/bin/
 
       - name: Archive assets
         run: tar czf ${{ matrix.asset_name }}.tar.gz extism-py