Merge branch 'main' into hotshot/rc-0.5.76

EspressoSystems · Sep 30, 2024 · 7137b37 · 7137b37
2 parents 5fda368 + c2b96e9
commit 7137b37
Show file tree

Hide file tree

Showing 8 changed files with 342 additions and 144 deletions.
diff --git a/.github/workflows/test-demo-native-marketplace.yml b/.github/workflows/test-demo-native-marketplace.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -20,6 +20,7 @@ concurrency:
 env:
   RUSTFLAGS: '--cfg async_executor_impl="async-std" --cfg async_channel_impl="async-std"'
   RUST_LOG: info,libp2p=off,node=error
+  CARGO_TERM_COLOR: always
 
 jobs:
   test:
@@ -34,6 +35,9 @@ jobs:
         with:
           version: nightly
 
+      - name: Install Nix
+        uses: cachix/install-nix-action@V27
+
       - uses: taiki-e/install-action@nextest
 
       - name: Checkout Repository
@@ -44,40 +48,50 @@ jobs:
       - name: Enable Rust Caching
         uses: Swatinem/rust-cache@v2
 
+      - name: Configure Environment
+        run: |
+          RUSTFLAGS="$RUSTFLAGS --cfg hotshot_example"
+          PATH="$PWD/target/release:$PATH"
+
       - name: Build
         # Build test binary with `testing` feature, which requires `hotshot_example` config
         run: |
-          export RUSTFLAGS="$RUSTFLAGS --cfg hotshot_example"
-          export PATH="$PWD/target/release:$PATH"
           cargo build --locked --release
           cargo nextest run --locked --release --workspace --all-features --no-run
         timeout-minutes: 90
 
       - name: Test
-        env:
-          CARGO_TERM_COLOR: always
         # Build test binary with `testing` feature, which requires `hotshot_example` config
-        run: |
-          export RUSTFLAGS="$RUSTFLAGS --cfg hotshot_example"
-          export PATH="$PWD/target/release:$PATH"
-          cargo nextest run --locked --release --workspace --all-features --verbose --no-fail-fast
+        run: cargo nextest run --locked --release --workspace --all-features --verbose --no-fail-fast
         timeout-minutes: 5
 
-      - name: Install Nix
-        uses: cachix/install-nix-action@V27
-
       - name: Install process-compose
-        run: |
-          nix profile install nixpkgs#process-compose
+        run: nix profile install nixpkgs#process-compose
+
+      - name: Pull Docker Images
+        run: docker compose pull || docker-compose pull
+
+      - name: Run Demo-Native
+        run: bash -x scripts/demo-native -D
 
       - name: Test Integration
         env:
-          CARGO_TERM_COLOR: always
           NEXTEST_PROFILE: integration
-        run: |
-          export RUSTFLAGS="$RUSTFLAGS --cfg hotshot_example"
-          export PATH="$PWD/target/release:$PATH"
-          docker compose pull || docker-compose pull
-          bash -x scripts/demo-native -D
-          cargo nextest run --locked --release --all-features --verbose --nocapture
+        run: cargo nextest run --locked --release --all-features --verbose --nocapture
+        timeout-minutes: 40
+
+      - name: Process Compose Down
+        run: process-compose down
+
+      - name: Run Demo-Native Marketplace
+        run: bash -x scripts/demo-native  -f process-compose.yaml -f process-compose-mp.yml -D
+
+      - name: Test Marketplace Integration
+        env:
+          NEXTEST_PROFILE: integration
+          MARKETPLACE_SMOKE_TEST: true
+        run: cargo nextest run --locked --release --all-features --verbose --nocapture
         timeout-minutes: 40
+
+      - name: Process Compose Down
+        run: process-compose down