chore: merge branch main-v0.13.2 into main (resolve conflicts)

starkware-libs · Sep 5, 2024 · c85e962 · c85e962
1 parent 13570b7
commit c85e962
Show file tree

Hide file tree

Showing 4 changed files with 1,227 additions and 13 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -67,7 +67,6 @@ jobs:
           LD_LIBRARY_PATH: ${{ steps.setup-pypy.outputs.pythonLocation }}/bin
         run: echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}" >> $GITHUB_ENV
 
-<<<<<<< HEAD
       - run: scripts/clippy.sh
 
   doc:
@@ -76,18 +75,6 @@ jobs:
       RUSTDOCFLAGS: "-D warnings"
     steps:
       - uses: actions/checkout@v4
-||||||| e9fef0f80
-      - run: scripts/clippy.sh
-
-  doc:
-    runs-on: starkware-ubuntu-latest-small
-    # env:
-    #   RUSTDOCFLAGS: "-D warnings"
-    steps:
-      - uses: actions/checkout@v4
-=======
-      # Install rust components.
->>>>>>> origin/main-v0.13.2
       - uses: ./.github/actions/install_rust
         with:
           components: rustfmt, clippy