Resolve conflicts

matthewmturner · Feb 3, 2025 · 4b1fffb · 4b1fffb
2 parents 49e99b2 + a36b84a
commit 4b1fffb
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 7,226 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -161,34 +161,34 @@ jobs:
       - name: Run Deltalake tests
         run: |
           cargo test --features=deltalake extension_cases::deltalake
-  # test-hudi:
-  #   name: Hudi
-  #   runs-on: ubuntu-latest
-  #   strategy:
-  #     matrix:
-  #       arch: [amd64]
-  #       rust: [stable]
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #       with:
-  #         submodules: true
-  #     - name: Cache Cargo
-  #       uses: actions/cache@v2
-  #       with:
-  #         path: /home/runner/.cargo
-  #         key: cargo-dft-cache-
-  #     - name: Cache Rust dependencies
-  #       uses: actions/cache@v2
-  #       with:
-  #         path: /home/runner/target
-  #         key: target-dft-cache-
-  #     - name: Setup Rust toolchain
-  #       run: |
-  #         rustup toolchain install ${{ matrix.rust }}
-  #         rustup default ${{ matrix.rust }}
-  #     - name: Run Hudi tests
-  #       run: |
-  #         cargo test --features=hudi extension_cases::hudi
+  test-hudi:
+    name: Hudi
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        arch: [amd64]
+        rust: [stable]
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+      - name: Cache Cargo
+        uses: actions/cache@v2
+        with:
+          path: /home/runner/.cargo
+          key: cargo-dft-cache-
+      - name: Cache Rust dependencies
+        uses: actions/cache@v2
+        with:
+          path: /home/runner/target
+          key: target-dft-cache-
+      - name: Setup Rust toolchain
+        run: |
+          rustup toolchain install ${{ matrix.rust }}
+          rustup default ${{ matrix.rust }}
+      - name: Run Hudi tests
+        run: |
+          cargo test --features=hudi extension_cases::hudi
   test-huggingface:
     name: HuggingFace
     runs-on: ubuntu-latest