Merge branch 'main' into patch-1

.config/nextest.toml

@@ -1,25 +1,9 @@
 [profile.default]
 # Kill tests after 3 periods of 2m, because they are probably hanging
 slow-timeout = { period = "2m", terminate-after = 3 }
-default-filter = 'not (test(slow_) | package(tests))'
+default-filter = 'not (deps(hotshot-testing) | test(slow_) | package(tests))'
 retries = 2
 
-# More flaky tests
-[[profile.default.overrides]]
-filter = """
-test(tests_2::catchup::test_all_restart) |
-test(tests_4::test_marketplace) |
-test(tests_6::test_epochs)
-"""
-retries = 10
-
-# Sometimes fails persistently in CI
-[[profile.default.overrides]]
-filter = """
-test(tests_4::test_with_builder_failures::test_with_builder_failures)
-"""
-threads-required = 2
-
 [[profile.default.overrides]]
 # These tests are fast if they work (usually about 150ms) but sometimes they
 # hang, especially when running Concurrently with other tests. Kill after a
@@ -36,6 +20,14 @@ retries  = 10
 filter = 'test(slow_test_restart)'
 threads-required = 'num-cpus'
 
+# HotShot integration tests
+[profile.hotshot]
+retries = 2
+slow-timeout = { period = "1m", terminate-after = 3 }
+default-filter = 'deps(hotshot-testing)'
+final-status-level = "flaky"
+threads-required = "num-test-threads"
+
 [profile.slow]
 slow-timeout = "2m"
 default-filter = 'test(slow_)'

.github/workflows/doc-rust.yml

@@ -20,8 +20,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
-      - name: Install Just
-        run: sudo apt-get install -y just
+      - uses: taiki-e/install-action@just
 
       - uses: Swatinem/rust-cache@v2
         name: Enable Rust Caching

.github/workflows/hotshot.yml

@@ -0,0 +1,83 @@
+name: HotShot integration tests
+
+on:
+  push:
+    branches:
+      - "main"
+  pull_request:
+  schedule:
+    - cron: "0 0 * * 1"
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ (github.ref == 'refs/heads/main' && github.run_number) || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        test_suites:
+          - test-ci-1
+          - test-ci-2
+          - test-ci-3
+          - test-ci-4
+          - test-ci-5
+          - test-ci-6-1
+          - test-ci-6-2
+          - test-ci-6-3
+          - test-ci-6-4
+          - test-ci-6-5
+          - test-ci-6-6
+          - test-ci-rest
+      fail-fast: false
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        name: Checkout Repository
+
+      - name: Install Rust
+        uses: mkroening/rust-toolchain-toml@main
+
+      - uses: Swatinem/rust-cache@v2
+        name: Enable Rust Caching
+        with:
+          shared-key: "hotshot-tests"
+          cache-on-failure: "true"
+          save-if: ${{ github.ref == 'refs/heads/main' && matrix.test_suites == 'test-ci-rest' }}
+
+      - uses: taiki-e/install-action@just
+
+      - uses: taiki-e/install-action@nextest
+
+      - name: Unit and integration tests for all crates in workspace
+        run: |
+          just hotshot::${{ matrix.test_suites }}
+        timeout-minutes: 60
+        env:
+          RUST_BACKTRACE: full
+
+  test-examples:
+    strategy:
+      fail-fast: false
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        name: Checkout Repository
+
+      - name: Install Rust
+        uses: mkroening/rust-toolchain-toml@main
+
+      - uses: Swatinem/rust-cache@v2
+        name: Enable Rust Caching
+        with:
+          shared-key: "hotshot-examples"
+          cache-on-failure: "true"
+          save-if: ${{ github.ref == 'refs/heads/main' }}
+
+      - uses: taiki-e/install-action@just
+
+      - name: Test examples
+        run: |
+          just hotshot::example all-push-cdn -- --config_file ./hotshot-orchestrator/run-config.toml
+        timeout-minutes: 20

Cargo.toml

@@ -193,7 +193,7 @@ log-panics = { version = "2.0", features = ["with-backtrace"] }
 lru = "0.12"
 strum = { version = "0.26", features = ["derive"] }
 surf-disco = "0.9"
-sqlx = "=0.8.2"
+sqlx = "=0.8.3"
 tagged-base64 = "0.4"
 tide-disco = "0.9.3"
 thiserror = "1.0.69"