ci: adj. python scripts and actions

Signed-off-by: Yuki Kishimoto <yukikishimoto@protonmail.com>
rust-nostr · Sep 19, 2024 · 79ecb35 · 79ecb35
1 parent ddd3d1d
commit 79ecb35
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 23 deletions.
diff --git a/.github/workflows/publish-python.yaml b/.github/workflows/publish-python.yaml
@@ -26,13 +26,14 @@ jobs:
     container:
       image: quay.io/pypa/manylinux_2_28_x86_64
       env:
-        PLAT: manylinux_2_28_x86_64
         PYBIN: "/opt/python/${{ matrix.python }}/bin"
     steps:
       - name: "Checkout"
         uses: actions/checkout@v3
 
-      - uses: actions-rs/toolchain@v1
+      # Needed because inside container
+      - name: "Setup Rust"
+        uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
 
@@ -44,7 +45,7 @@ jobs:
 
       - uses: actions/upload-artifact@v3
         with:
-          name: nostr_sdk-manylinux_2_28_x86_64-${{ matrix.python }}
+          name: nostr_protocol-manylinux_2_28_x86_64-${{ matrix.python }}
           path: /home/runner/work/nostr/nostr/bindings/nostr-ffi/bindings-python/dist/*.whl
 
   build-linux-aarch64:
@@ -60,10 +61,6 @@ jobs:
       - name: "Checkout"
         uses: actions/checkout@v3
 
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-
       - name: "Setup Python"
         uses: actions/setup-python@v4
         with:

diff --git a/.github/workflows/publish-sdk-python.yaml b/.github/workflows/publish-sdk-python.yaml
@@ -26,13 +26,14 @@ jobs:
     container:
       image: quay.io/pypa/manylinux_2_28_x86_64
       env:
-        PLAT: manylinux_2_28_x86_64
         PYBIN: "/opt/python/${{ matrix.python }}/bin"
     steps:
       - name: "Checkout"
         uses: actions/checkout@v3
 
-      - uses: actions-rs/toolchain@v1
+      # Needed because inside container
+      - name: "Setup Rust"
+        uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
 
@@ -60,10 +61,6 @@ jobs:
       - name: "Checkout"
         uses: actions/checkout@v3
 
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-
       - name: "Setup Python"
         uses: actions/setup-python@v4
         with:

diff --git a/bindings/nostr-ffi/bindings-python/scripts/generate-linux-x86_64.sh b/bindings/nostr-ffi/bindings-python/scripts/generate-linux-x86_64.sh
@@ -4,15 +4,14 @@ set -euo pipefail
 ${PYBIN}/python --version
 ${PYBIN}/pip install -r requirements.txt
 
-cd ../
-
 echo "Generating native binaries..."
-cargo build --release
+rustup target add x86_64-unknown-linux-gnu
+cargo build --release --target x86_64-unknown-linux-gnu
 
 echo "Generating nostr.py..."
-cargo run -p uniffi-bindgen generate --library ../../target/release/libnostr_ffi.so --language python --no-format -o bindings-python/src/nostr/
+cargo run -p uniffi-bindgen generate --library ../../target/x86_64-unknown-linux-gnu/release/libnostr_ffi.so --language python --no-format -o bindings-python/src/nostr/
 
 echo "Copying linux libnostr_ffi.so..."
-cp ../../target/release/libnostr_ffi.so bindings-python/src/nostr/
+cp ../../target/x86_64-unknown-linux-gnu/release/libnostr_ffi.so bindings-python/src/nostr/
 
 echo "All done!"
diff --git a/bindings/nostr-sdk-ffi/bindings-python/scripts/generate-linux-x86_64.sh b/bindings/nostr-sdk-ffi/bindings-python/scripts/generate-linux-x86_64.sh
@@ -5,13 +5,14 @@ ${PYBIN}/python --version
 ${PYBIN}/pip install -r requirements.txt
 
 echo "Generating native binaries..."
-cargo build --release
+rustup target add x86_64-unknown-linux-gnu
+cargo build --release --target x86_64-unknown-linux-gnu
 
 echo "Generating nostr_sdk.py..."
 cd ../
-cargo run -p uniffi-bindgen generate --library ../../target/release/libnostr_sdk_ffi.so --language python --no-format -o bindings-python/src/nostr-sdk/
+cargo run -p uniffi-bindgen generate --library ../../target/x86_64-unknown-linux-gnu/release/libnostr_sdk_ffi.so --language python --no-format -o bindings-python/src/nostr-sdk/
 
 echo "Copying linux libnostr_sdk_ffi.so..."
-cp ../../target/release/libnostr_sdk_ffi.so bindings-python/src/nostr-sdk/
+cp ../../target/x86_64-unknown-linux-gnu/release/libnostr_sdk_ffi.so bindings-python/src/nostr-sdk/
 
 echo "All done!"
diff --git a/bindings/nostr-sdk-ffi/bindings-python/scripts/generate-windows.sh b/bindings/nostr-sdk-ffi/bindings-python/scripts/generate-windows.sh
@@ -6,8 +6,7 @@ pip install --user -r requirements.txt
 
 echo "Generating native binaries..."
 rustup target add x86_64-pc-windows-msvc
-# TODO: enable all features
-cargo build --release --target x86_64-pc-windows-msvc --features lmdb
+cargo build --release --target x86_64-pc-windows-msvc
 
 echo "Generating nostr_sdk.py..."
 cd ../