Skip to content

Commit 405da56

Browse files
dignifiedquirerklaehnArqu
authored
refactor: use external protocols & update to iroh@0.29 (#209)
* 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>
1 parent 473b2e8 commit 405da56

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+4240
-3009
lines changed

.github/workflows/ci.yml

+9-7
Original file line numberDiff line numberDiff line change
@@ -162,14 +162,16 @@ jobs:
162162
- name: install ktlint
163163
uses: arqu/action-ktlint-setup@main
164164

165-
- name: fetch jna
166-
run: curl -L https://repo1.maven.org/maven2/net/java/dev/jna/jna/5.14.0/jna-5.14.0.jar -o jna.jar
167-
- name: fetch kotlinx-coroutines
168-
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
165+
- name: Setup Gradle
166+
uses: gradle/actions/setup-gradle@v4
169167

170-
- name: run kotlin tests
168+
- name: build kotlin
171169
env:
172-
CLASSPATH: ./jna.jar:./kotlinx-coroutines.jar
173170
TEST_OS: ${{ matrix.os }}
174171
shell: bash
175-
run: ./test_kotlin.sh
172+
run: ./make_kotlin.sh
173+
174+
- name: Gradle Test
175+
run: |
176+
cd kotlin
177+
./gradlew test

.github/workflows/wheels.yml

+9-10
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@ concurrency:
1111
cancel-in-progress: true
1212

1313
env:
14-
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
1514
IROH_FORCE_STAGING_RELAYS: "1"
1615

1716
jobs:
18-
manylinux2014:
17+
manylinux:
1918
runs-on: ${{ matrix.runner }}
2019
container: ${{ matrix.container }}
2120
strategy:
@@ -25,19 +24,19 @@ jobs:
2524
- name: ubuntu-latest
2625
python: 3.11
2726
os: ubuntu-latest
28-
release-os: manylinux2014
27+
release-os: manylinux_2_28
2928
release-arch: x86_64
30-
container: quay.io/pypa/manylinux2014_x86_64
29+
container: quay.io/pypa/manylinux_2_28_x86_64
3130
runner: [ubuntu-latest]
3231
- name: ubuntu-arm-latest
3332
python: 3.11
3433
os: ubuntu-latest
35-
release-os: manylinux2014
34+
release-os: manylinux_2_28
3635
release-arch: aarch64
37-
container: quay.io/pypa/manylinux2014_aarch64
36+
container: quay.io/pypa/manylinux_2_28_aarch64
3837
runner: [self-hosted, linux, ARM64]
3938
steps:
40-
- uses: actions/checkout@v3
39+
- uses: actions/checkout@v4
4140
- name: Install stable rust
4241
run: curl --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
4342
- name: Install maturin & uniffi-bindgen
@@ -49,7 +48,7 @@ jobs:
4948
PATH=/opt/python/cp311-cp311/bin:$PATH
5049
export PATH
5150
maturin --version
52-
maturin build --release --manylinux 2014
51+
maturin build --release --manylinux 2_28
5352
- name: Upload wheel
5453
uses: actions/upload-artifact@v3
5554
with:
@@ -75,7 +74,7 @@ jobs:
7574
release-arch: aarch64
7675
runner: [self-hosted, macOS, ARM64]
7776
steps:
78-
- uses: actions/checkout@v3
77+
- uses: actions/checkout@v4
7978
- uses: dtolnay/rust-toolchain@stable
8079
- uses: actions/setup-python@v4
8180
with:
@@ -96,7 +95,7 @@ jobs:
9695
windows:
9796
runs-on: windows-latest
9897
steps:
99-
- uses: actions/checkout@v3
98+
- uses: actions/checkout@v4
10099
- uses: dtolnay/rust-toolchain@stable
101100
- uses: actions/setup-python@v4
102101
with:

.gitignore

+1-4
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,15 @@ __pycache__/
3939
.Python
4040
.venv/
4141
env/
42-
bin/
4342
build/
4443
develop-eggs/
4544
dist/
4645
eggs/
47-
lib/
4846
lib64/
4947
parts/
5048
sdist/
5149
var/
5250
include/
53-
man/
5451
venv/
5552
*.egg-info/
5653
.installed.cfg
@@ -114,4 +111,4 @@ package-lock.json
114111
# Kotlin
115112

116113
kotlin/*.jar
117-
kotlin/*.dylib
114+
kotlin/**/*.dylib

0 commit comments

Comments
 (0)