Skip to content

Commit

Permalink
remove circular dependency (#360)
Browse files Browse the repository at this point in the history
* remove circular dependency

* fix test vector runner

* test vector version update

* update

* update
  • Loading branch information
nitro-neal authored Sep 19, 2024
1 parent 160a894 commit 19e5d1a
Showing 1 changed file with 46 additions and 43 deletions.
89 changes: 46 additions & 43 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -194,51 +194,13 @@ jobs:
- name: Test
run: just test

kotlin-acceptance-test:
needs: kotlin-build-test-deploy-snapshot
strategy:
matrix:
os: [ ubuntu-latest, macos-latest, macos-12, windows-latest ]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
with:
submodules: true
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
distribution: "adopt"
java-version: "11"
- name: Download web5 w/ Dependencies JAR
uses: actions/[email protected]
with:
name: web5-with-dependencies-jar
path: tests/jvm
- name: Run Acceptance Tests (Non-Windows)
if: matrix.os != 'windows-latest'
shell: bash
run: |
cd tests/jvm
mv *-with-dependencies.jar web5-with-dependencies.jar
javac Web5AcceptanceTest.java -cp web5-with-dependencies.jar
java -classpath web5-with-dependencies.jar:. Web5AcceptanceTest
- name: Run Acceptance Tests (Windows)
if: matrix.os == 'windows-latest'
shell: cmd
run: |
cd tests/jvm
ren *-with-dependencies.jar web5-with-dependencies.jar
javac Web5AcceptanceTest.java -cp web5-with-dependencies.jar
java -classpath web5-with-dependencies.jar;. Web5AcceptanceTest
kotlin-build-test-deploy-snapshot:
needs:
- build_aarch64_apple_darwin
- build_x86_64_apple_darwin
- build_x86_64_unknown_linux_gnu
- build_x86_64_unknown_linux_musl
- build_x86_64_pc_windows_msvc
- kotlin-acceptance-test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -346,16 +308,57 @@ jobs:
name: web5-with-dependencies-jar
path: bound/kt/target/*-with-dependencies.jar

kotlin-acceptance-test:
needs: kotlin-build-test-deploy-snapshot
strategy:
matrix:
os: [ ubuntu-latest, macos-latest, macos-12, windows-latest ]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
with:
submodules: true
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
distribution: "adopt"
java-version: "11"
- name: Download web5 w/ Dependencies JAR
uses: actions/[email protected]
with:
name: web5-with-dependencies-jar
path: tests/jvm
- name: Run Acceptance Tests (Non-Windows)
if: matrix.os != 'windows-latest'
shell: bash
run: |
cd tests/jvm
mv *-with-dependencies.jar web5-with-dependencies.jar
javac Web5AcceptanceTest.java -cp web5-with-dependencies.jar
java -classpath web5-with-dependencies.jar:. Web5AcceptanceTest
- name: Run Acceptance Tests (Windows)
if: matrix.os == 'windows-latest'
shell: cmd
run: |
cd tests/jvm
ren *-with-dependencies.jar web5-with-dependencies.jar
javac Web5AcceptanceTest.java -cp web5-with-dependencies.jar
java -classpath web5-with-dependencies.jar;. Web5AcceptanceTest
rust-test-vectors:
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
with:
submodules: true
- name: Install Rust 1.74.0
run: rustup toolchain install 1.74.0
- name: Set Rust 1.74.0 as default
run: rustup default 1.74.0
- name: Init Hermit
uses: cashapp/activate-hermit@v1
with:
cache: true
- name: Setup
run: just setup
- name: Install latest stable Rust
run: rustup install stable && rustup default stable
- name: Install Nextest
run: cargo install cargo-nextest
- name: Create nextest.toml
Expand All @@ -377,4 +380,4 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: rust-test-results
path: test-results/rust-test-results.xml
path: test-results/rust-test-results.xml

0 comments on commit 19e5d1a

Please sign in to comment.