Skip to content

Commit b45d968

Browse files
authored
fix!: placement of python dependencies on disk, add debug flag (#17)
1 parent b70c5df commit b45d968

File tree

10 files changed

+4626
-35
lines changed

10 files changed

+4626
-35
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- uses: actions-rs/toolchain@v1
1818
with:
1919
profile: default
20-
toolchain: stable
20+
toolchain: 1.81.0
2121
target: wasm32-wasi
2222
default: true
2323

@@ -36,10 +36,10 @@ jobs:
3636
go install github.com/extism/cli/[email protected]
3737
cd /tmp
3838
# get just wasm-merge and wasm-opt
39-
curl -L https://github.com/WebAssembly/binaryen/releases/download/version_116/binaryen-version_116-x86_64-linux.tar.gz > binaryen.tar.gz
39+
curl -L https://github.com/WebAssembly/binaryen/releases/download/version_117/binaryen-version_117-x86_64-linux.tar.gz > binaryen.tar.gz
4040
tar xvzf binaryen.tar.gz
41-
sudo cp binaryen-version_116/bin/wasm-merge /usr/local/bin
42-
sudo cp binaryen-version_116/bin/wasm-opt /usr/local/bin
41+
sudo cp binaryen-version_117/bin/wasm-merge /usr/local/bin
42+
sudo cp binaryen-version_117/bin/wasm-opt /usr/local/bin
4343
if: runner.os != 'Windows'
4444

4545
- name: Update deps (Windows)
@@ -48,11 +48,11 @@ jobs:
4848
go install github.com/extism/cli/extism@c1eb1fc
4949
Remove-Item -Recurse -Path "c:\Program files\Binaryen" -Force -ErrorAction SilentlyContinue > $null 2>&1
5050
New-Item -ItemType Directory -Force -Path "c:\Program files\Binaryen" -ErrorAction Stop > $null 2>&1
51-
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"
52-
7z x "$env:TMP\binaryen-version_116-x86_64-windows.tar.gz" -o"$env:TMP\" >$null 2>&1
53-
7z x -ttar "$env:TMP\binaryen-version_116-x86_64-windows.tar" -o"$env:TMP\" >$null 2>&1
54-
Copy-Item -Path "$env:TMP\binaryen-version_116\bin\wasm-opt.exe" -Destination "c:\Program files\Binaryen" -ErrorAction Stop > $null 2>&1
55-
Copy-Item -Path "$env:TMP\binaryen-version_116\bin\wasm-merge.exe" -Destination "c:\Program files\Binaryen" -ErrorAction Stop > $null 2>&1
51+
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"
52+
7z x "$env:TMP\binaryen-version_117-x86_64-windows.tar.gz" -o"$env:TMP\" >$null 2>&1
53+
7z x -ttar "$env:TMP\binaryen-version_117-x86_64-windows.tar" -o"$env:TMP\" >$null 2>&1
54+
Copy-Item -Path "$env:TMP\binaryen-version_117\bin\wasm-opt.exe" -Destination "c:\Program files\Binaryen" -ErrorAction Stop > $null 2>&1
55+
Copy-Item -Path "$env:TMP\binaryen-version_117\bin\wasm-merge.exe" -Destination "c:\Program files\Binaryen" -ErrorAction Stop > $null 2>&1
5656
if: runner.os == 'Windows'
5757

5858
- name: Run Tests (Linux)

.github/workflows/ci_install.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,15 @@ jobs:
2020
- name: Test Install Script
2121
run: |
2222
bash ./install.sh
23+
if: runner.os != 'Windows'
24+
25+
- name: Test Installation
26+
run: |
2327
which extism-py
2428
extism-py --version
2529
if: runner.os != 'Windows'
2630

31+
2732
# - name: Test Install Script Part1 (Windows)
2833
# run: |
2934
# powershell -executionpolicy bypass -File .\install-windows.ps1

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
uses: actions-rs/toolchain@v1
1818
with:
1919
profile: default
20-
toolchain: stable
20+
toolchain: 1.81.0
2121
target: wasm32-wasi
2222
default: true
2323

@@ -132,7 +132,7 @@ jobs:
132132
run: cd bin && cargo build --release --target ${{ matrix.target }} --package extism-py
133133

134134
- name: Create directory structure
135-
run: mkdir -p extism-py/bin extism-py/share && mv wasi-deps/usr extism-py/share/extism-py && mv ${{ matrix.path }} extism-py/bin/
135+
run: mkdir -p extism-py/bin extism-py/share && mv wasi-deps extism-py/share/extism-py && mv ${{ matrix.path }} extism-py/bin/
136136

137137
- name: Archive assets
138138
run: tar czf ${{ matrix.asset_name }}.tar.gz extism-py

0 commit comments

Comments
 (0)