chore: merge branch main-v0.13.4 into main (with conflicts)

lambdaclass · Jan 8, 2025 · 41080c5 · 41080c5
2 parents cb339eb + aa2ef2c
commit 41080c5
Show file tree

Hide file tree

Showing 174 changed files with 27,216 additions and 19,037 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -1,5 +1,5 @@
 [env]
-CAIRO_NATIVE_RUNTIME_LIBRARY = "./libcairo_native_runtime.a"
+CAIRO_NATIVE_RUNTIME_LIBRARY = "../blockifier/libcairo_native_runtime.a"
 LLVM_SYS_191_PREFIX = "/usr/lib/llvm-19/"
 MLIR_SYS_190_PREFIX = "/usr/lib/llvm-19/"
 TABLEGEN_190_PREFIX = "/usr/lib/llvm-19/"

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -19,6 +19,7 @@ on:
 env:
   CI: 1
   RUSTFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"
+  RUSTDOCFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"
   EXTRA_RUST_TOOLCHAINS: nightly-2024-04-29
 
 # On PR events, cancel existing CI runs on this same PR for this workflow.

diff --git a/.github/workflows/papyrus_docker-publish.yml b/.github/workflows/papyrus_docker-publish.yml
@@ -70,8 +70,8 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=ref,event=pr
-            # set `dev` tag for the default branch (`main`).
-            type=raw,value=dev,enable={{is_default_branch}}
+            # set `main*` tag for the default / release branches.
+            type=raw,value={{branch}},enable=${{ github.event_name == 'push' && contains(github.ref, 'main') }}
             type=raw,value={{branch}}{{tag}}-{{sha}},enable=${{ github.event_name == 'workflow_dispatch' }}
 
       # Build and push Docker image with Buildx

diff --git a/.github/workflows/upload_artifacts_workflow.yml b/.github/workflows/upload_artifacts_workflow.yml
@@ -99,9 +99,9 @@ jobs:
             * [Started at ${{ github.event.pull_request.updated_at }}](${{ env.WORKFLOW_LINK }})
 
       # Build artifact.
-      - uses: ./.github/actions/bootstrap
       - name: Build native blockifier
-        run: ./build_native_in_docker.sh scripts/build_native_blockifier.sh
+        run: |
+          ./build_native_in_docker.sh scripts/build_native_blockifier.sh
 
       # Rename is required; see https://pyo3.rs/v0.19.2/building_and_distribution#manual-builds.
       - name: Rename shared object
@@ -115,9 +115,23 @@ jobs:
         with:
           credentials_json: ${{ secrets.SA_NATIVE_BLOCKIFIER_ARTIFACTS_BUCKET_WRITER_ACCESS_KEY }}
 
-      - name: Upload binary to GCP
-        id: upload_file
+      - name: Upload native blockifier shared object to GCP
+        id: upload_nb_file
         uses: "google-github-actions/upload-cloud-storage@v2"
         with:
           path: "target/release/native_blockifier.pypy39-pp73-x86_64-linux-gnu.so"
           destination: "native_blockifier_artifacts/${{ env.SHORT_HASH }}/release/"
+
+      - name: Upload starknet-native-compile to GCP
+        id: upload_snc_file
+        uses: "google-github-actions/upload-cloud-storage@v2"
+        with:
+          path: "target/release/shared_executables/starknet-native-compile"
+          destination: "native_blockifier_artifacts/${{ env.SHORT_HASH }}/release/"
+
+      - name: Upload libcairo_native_runtime.a to GCP
+        id: upload_lnr_file
+        uses: "google-github-actions/upload-cloud-storage@v2"
+        with:
+          path: "crates/blockifier/cairo_native/target/release/libcairo_native_runtime.a"
+          destination: "native_blockifier_artifacts/${{ env.SHORT_HASH }}/release/"