From dabfa20d255bdb1c35586aae3ce3d11551dd274b Mon Sep 17 00:00:00 2001 From: Neal Date: Thu, 19 Sep 2024 11:47:12 -0700 Subject: [PATCH 1/5] remove circular dependency --- .github/workflows/ci.yml | 75 ++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 38 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4076e7be..367d1817 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -194,43 +194,6 @@ 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/download-artifact@v4.1.7 - 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 @@ -238,7 +201,6 @@ jobs: - 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 @@ -346,6 +308,43 @@ 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/download-artifact@v4.1.7 + 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: From bfd4c3c83e611752ac42ed4d6b315f5827fddd6c Mon Sep 17 00:00:00 2001 From: Neal Date: Thu, 19 Sep 2024 12:01:16 -0700 Subject: [PATCH 2/5] fix test vector runner --- .github/workflows/ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 367d1817..411fd618 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -351,10 +351,12 @@ jobs: - 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 Nextest run: cargo install cargo-nextest - name: Create nextest.toml From d527d688b9084857eed015dc3f1a85f516441df8 Mon Sep 17 00:00:00 2001 From: Neal Date: Thu, 19 Sep 2024 12:15:10 -0700 Subject: [PATCH 3/5] test vector version update --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 411fd618..bff9b2d8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -345,12 +345,14 @@ jobs: javac Web5AcceptanceTest.java -cp web5-with-dependencies.jar java -classpath web5-with-dependencies.jar;. Web5AcceptanceTest - rust-test-vectors: + rust-web5-test-vectors: runs-on: macos-latest steps: - uses: actions/checkout@v4 with: submodules: true + - name: Install latest stable Rust + run: rustup install stable && rustup default stable - name: Init Hermit uses: cashapp/activate-hermit@v1 with: From a610ea1677458635113c873972090e0e113bda74 Mon Sep 17 00:00:00 2001 From: Neal Date: Thu, 19 Sep 2024 12:17:09 -0700 Subject: [PATCH 4/5] update --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bff9b2d8..0da0aeb2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -355,8 +355,6 @@ jobs: run: rustup install stable && rustup default stable - name: Init Hermit uses: cashapp/activate-hermit@v1 - with: - cache: true - name: Setup run: just setup - name: Install Nextest From aa9cbca0bc18778508e771c8fe1ab99a5ac6ab4a Mon Sep 17 00:00:00 2001 From: Neal Date: Thu, 19 Sep 2024 12:20:03 -0700 Subject: [PATCH 5/5] update --- .github/workflows/ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0da0aeb2..3d907ccc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -345,18 +345,20 @@ jobs: javac Web5AcceptanceTest.java -cp web5-with-dependencies.jar java -classpath web5-with-dependencies.jar;. Web5AcceptanceTest - rust-web5-test-vectors: + rust-test-vectors: runs-on: macos-latest steps: - uses: actions/checkout@v4 with: submodules: true - - name: Install latest stable Rust - run: rustup install stable && rustup default stable - 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 @@ -378,4 +380,4 @@ jobs: uses: actions/upload-artifact@v3 with: name: rust-test-results - path: test-results/rust-test-results.xml \ No newline at end of file + path: test-results/rust-test-results.xml