Skip to content

Commit

Permalink
refactor: use external protocols & update to iroh@0.29 (#209)
Browse files Browse the repository at this point in the history
* refactor: use external iroh-gossip

* make it work with the latest code

* updated to merged deps

* update to latest `main`

* update to latest changes of renaming

* wire up node rpc

* fix tests

* implement blob events

* fix python tests

* bump action deps

* bump manylinux image

* bump job name

* drop unused node version flag

* round out bump for manylinux

* forgot to bump the ci script

* start setting up gradle for kotlin tests

* update ci

* ci: fixup

* ci: fixup

* doc test and better logging

* finish test conversion

* rebuild swift

* update to 0.29

* remove dylib

* kotlin: move test dep

* cleanup

* update to quic-rpc 0.17

* update doc fixture

* bump versions

* rebuild otlin

* upgrade js code

* fix js tests

* rebuild swift

* fixup

---------

Co-authored-by: Ruediger Klaehn <rklaehn@protonmail.com>
Co-authored-by: Asmir Avdicevic <asmir.avdicevic64@gmail.com>
  • Loading branch information
3 people authored Dec 4, 2024
1 parent 473b2e8 commit 405da56
Show file tree
Hide file tree
Showing 72 changed files with 4,240 additions and 3,009 deletions.
16 changes: 9 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -162,14 +162,16 @@ jobs:
- name: install ktlint
uses: arqu/action-ktlint-setup@main

- name: fetch jna
run: curl -L https://repo1.maven.org/maven2/net/java/dev/jna/jna/5.14.0/jna-5.14.0.jar -o jna.jar
- name: fetch kotlinx-coroutines
run: curl -L https://repo1.maven.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.6.4/kotlinx-coroutines-core-jvm-1.6.4.jar -o kotlinx-coroutines.jar
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: run kotlin tests
- name: build kotlin
env:
CLASSPATH: ./jna.jar:./kotlinx-coroutines.jar
TEST_OS: ${{ matrix.os }}
shell: bash
run: ./test_kotlin.sh
run: ./make_kotlin.sh

- name: Gradle Test
run: |
cd kotlin
./gradlew test
19 changes: 9 additions & 10 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ concurrency:
cancel-in-progress: true

env:
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
IROH_FORCE_STAGING_RELAYS: "1"

jobs:
manylinux2014:
manylinux:
runs-on: ${{ matrix.runner }}
container: ${{ matrix.container }}
strategy:
Expand All @@ -25,19 +24,19 @@ jobs:
- name: ubuntu-latest
python: 3.11
os: ubuntu-latest
release-os: manylinux2014
release-os: manylinux_2_28
release-arch: x86_64
container: quay.io/pypa/manylinux2014_x86_64
container: quay.io/pypa/manylinux_2_28_x86_64
runner: [ubuntu-latest]
- name: ubuntu-arm-latest
python: 3.11
os: ubuntu-latest
release-os: manylinux2014
release-os: manylinux_2_28
release-arch: aarch64
container: quay.io/pypa/manylinux2014_aarch64
container: quay.io/pypa/manylinux_2_28_aarch64
runner: [self-hosted, linux, ARM64]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install stable rust
run: curl --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
- name: Install maturin & uniffi-bindgen
Expand All @@ -49,7 +48,7 @@ jobs:
PATH=/opt/python/cp311-cp311/bin:$PATH
export PATH
maturin --version
maturin build --release --manylinux 2014
maturin build --release --manylinux 2_28
- name: Upload wheel
uses: actions/upload-artifact@v3
with:
Expand All @@ -75,7 +74,7 @@ jobs:
release-arch: aarch64
runner: [self-hosted, macOS, ARM64]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: actions/setup-python@v4
with:
Expand All @@ -96,7 +95,7 @@ jobs:
windows:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: actions/setup-python@v4
with:
Expand Down
5 changes: 1 addition & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,15 @@ __pycache__/
.Python
.venv/
env/
bin/
build/
develop-eggs/
dist/
eggs/
lib/
lib64/
parts/
sdist/
var/
include/
man/
venv/
*.egg-info/
.installed.cfg
Expand Down Expand Up @@ -114,4 +111,4 @@ package-lock.json
# Kotlin

kotlin/*.jar
kotlin/*.dylib
kotlin/**/*.dylib
Loading

0 comments on commit 405da56

Please sign in to comment.