Revert "feat(ci): add native dependencies to the CI (dynamic docker) (#…

…726)" (#864) * Revert "feat(ci): add native dependencies to the CI (dynamic docker) (#726)" This reverts commit c1f680a. * fix: update compiler version in compiled feature contracts and fix gas
starkware-libs · Sep 19, 2024 · ac56ada · ac56ada
1 parent 83bc16a
commit ac56ada
Show file tree

Hide file tree

Showing 26 changed files with 87 additions and 734 deletions.
diff --git a/.github/actions/setup-native-deps/action.yml b/.github/actions/setup-native-deps/action.yml
diff --git a/.github/workflows/blockifier_ci.yml b/.github/workflows/blockifier_ci.yml
@@ -46,17 +46,19 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           prefix-key: "v0-rust-ubuntu-20.04"
-      - name: Set up Native Dependencies
-        uses: ./.github/actions/setup-native-deps
-        id: native-deps
       - run: cargo build -p blockifier
       - run: cargo test -p blockifier
 
   native-blockifier-artifacts-push:
-    runs-on: starkware-ubuntu-latest-large
+    runs-on: starkware-ubuntu-20-04-medium
     steps:
       - uses: actions/checkout@v4
-
+      - uses: ./.github/actions/install_rust
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          prefix-key: "v1-rust-ubuntu-20.04"
+
       - name: Build native blockifier
         run: ./build_native_in_docker.sh scripts/build_native_blockifier.sh
 

diff --git a/.github/workflows/blockifier_compiled_cairo.yml b/.github/workflows/blockifier_compiled_cairo.yml
@@ -40,10 +40,6 @@ jobs:
         with:
           prefix-key: "v0-rust-ubuntu-20.04"
 
-      - name: Set up Native Dependencies
-        uses: ./.github/actions/setup-native-deps
-        id: native-deps
-
       # Setup pypy and link to the location expected by .cargo/config.toml.
       - uses: actions/setup-python@v5
         id: setup-pypy

diff --git a/.github/workflows/blockifier_post-merge.yml b/.github/workflows/blockifier_post-merge.yml
@@ -21,10 +21,6 @@ jobs:
         with:
           prefix-key: "v0-rust-ubuntu-20.04"
 
-      - name: Set up Native Dependencies
-        uses: ./.github/actions/setup-native-deps
-        id: native-deps
-
       # Setup pypy and link to the location expected by .cargo/config.toml.
       - uses: actions/setup-python@v5
         id: setup-pypy

diff --git a/.github/workflows/committer_ci.yml b/.github/workflows/committer_ci.yml
@@ -76,7 +76,7 @@ jobs:
 
       # List the existing benchmarks.
       - run: |
-          cargo bench -p committer_cli -- --list | grep ': benchmark$' | sed -e "s/: benchmark$//" > benchmarks_list.txt
+            cargo bench -p committer_cli -- --list | grep ': benchmark$' | sed -e "s/: benchmark$//" > benchmarks_list.txt
 
       # Benchmark the old code.
       - run: cargo bench -p committer_cli
@@ -119,7 +119,6 @@ jobs:
               owner: context.repo.owner,
               repo: context.repo.repo,
               body: fs.readFileSync('bench_new.txt', 'utf8'),
-              path: 'Commits'
             })
 
   gcs-push:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -66,11 +66,6 @@ jobs:
       - uses: ./.github/actions/install_rust
         with:
           components: clippy
-
-      - name: Set up Native Dependencies
-        uses: ./.github/actions/setup-native-deps
-        id: native-deps
-
       - uses: Swatinem/rust-cache@v2
         with:
           prefix-key: "v0-rust-ubuntu-20.04"
@@ -94,9 +89,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/install_rust
-      - name: Set up Native Dependencies
-        uses: ./.github/actions/setup-native-deps
-        id: native-deps
       - uses: Swatinem/rust-cache@v2
       - uses: Noelware/[email protected]
         with:
@@ -108,23 +100,17 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/install_rust
-      - name: Set up Native Dependencies
-        uses: ./.github/actions/setup-native-deps
-        id: native-deps
       - uses: Swatinem/rust-cache@v2
       - run: cargo test -p workspace_tests
 
   run-tests:
-    runs-on: starkware-ubuntu-latest-large
+    runs-on: starkware-ubuntu-20-04-medium
     steps:
       - uses: actions/checkout@v4
         with:
           # Fetch the entire history.
           fetch-depth: 0
       - uses: ./.github/actions/install_rust
-      - name: Set up Native Dependencies
-        uses: ./.github/actions/setup-native-deps
-        id: native-deps
       - uses: Noelware/[email protected]
       - uses: Swatinem/rust-cache@v2
         with:
@@ -189,9 +175,6 @@ jobs:
       - uses: Noelware/[email protected]
         with:
           version: ${{env.PROTOC_VERSION}}
-      - name: Set up Native Dependencies
-        uses: ./.github/actions/setup-native-deps
-        id: native-deps
       - run: cargo check --workspace -r --all-features
 
   merge-gatekeeper:
@@ -207,7 +190,7 @@ jobs:
         uses: upsidr/merge-gatekeeper@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          timeout: 1500
+          timeout: 1200
           interval: 30
           ignored: "code-review/reviewable"
 
@@ -217,7 +200,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           ref: ${{github.ref}}
-          timeout: 1500
+          timeout: 1200
           interval: 30
           ignored: "code-review/reviewable"
 
@@ -233,9 +216,6 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y clang llvm libudev-dev
-      - name: Set up Native Dependencies
-        uses: ./.github/actions/setup-native-deps
-        id: native-deps
       - uses: Noelware/[email protected]
         with:
           version: ${{env.PROTOC_VERSION}}

diff --git a/.github/workflows/papyrus_benchmark.yaml b/.github/workflows/papyrus_benchmark.yaml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   # TODO: Uncomment and run this automatically when the storage benchmark is fixed.
   # push:
-  # branches: [main]
+    # branches: [main]
 
 jobs:
   storage-benchmark:

diff --git a/.github/workflows/papyrus_ci.yml b/.github/workflows/papyrus_ci.yml
@@ -2,7 +2,7 @@ name: Papyrus-CI
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
     paths:
       - '.github/workflows/papyrus_ci.yml'
       - 'Dockerfile'
@@ -31,7 +31,7 @@ on:
       - 'crates/starknet_client/**'
 
   merge_group:
-    types: [ checks_requested ]
+    types: [checks_requested]
 
 # On PR events, cancel existing CI runs on this same PR for this workflow.
 concurrency:
@@ -48,9 +48,6 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/install_rust
       - uses: Swatinem/rust-cache@v2
-      - name: Set up Native Dependencies
-        uses: ./.github/actions/setup-native-deps
-        id: native-deps
       - uses: Noelware/[email protected]
         with:
           version: ${{env.PROTOC_VERSION}}
@@ -70,9 +67,6 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/install_rust
       - uses: Swatinem/rust-cache@v2
-      - name: Set up Native Dependencies
-        uses: ./.github/actions/setup-native-deps
-        id: native-deps
       - uses: Noelware/[email protected]
         with:
           version: ${{env.PROTOC_VERSION}}
@@ -92,9 +86,6 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
-      - name: Set up Native Dependencies
-        uses: ./.github/actions/setup-native-deps
-        id: native-deps
       - uses: Noelware/[email protected]
         with:
           version: ${{env.PROTOC_VERSION}}
@@ -116,9 +107,6 @@ jobs:
       - uses: Noelware/[email protected]
         with:
           version: ${{env.PROTOC_VERSION}}
-      - name: Set up Native Dependencies
-        uses: ./.github/actions/setup-native-deps
-        id: native-deps
       - run: >
           cargo test -r
           --test latency_histogram
@@ -134,9 +122,6 @@ jobs:
       - uses: ./.github/actions/install_rust
       - uses: Swatinem/rust-cache@v2
       - uses: Noelware/[email protected]
-      - name: Set up Native Dependencies
-        uses: ./.github/actions/setup-native-deps
-        id: native-deps
 
       - run: |
           cargo test -p papyrus_node --no-default-features
@@ -155,9 +140,7 @@ jobs:
       - uses: Noelware/[email protected]
         with:
           version: ${{env.PROTOC_VERSION}}
-      - name: Set up Native Dependencies
-        uses: ./.github/actions/setup-native-deps
-        id: native-deps
+
       - name: Install cargo-llvm-cov
         uses: taiki-e/install-action@cargo-llvm-cov
       - uses: Swatinem/rust-cache@v2
@@ -214,9 +197,6 @@ jobs:
             target_directory:
               - 'crates/papyrus_storage/src/db/**'
       - uses: ./.github/actions/install_rust
-      - name: Set up Native Dependencies
-        uses: ./.github/actions/setup-native-deps
-        id: native-deps
       - uses: Swatinem/rust-cache@v2
       # repeat this job 32 times. this is a random test for part of the code that may cause a corrupted database.
       - run: for run in {1..32}; do cargo test -r -p papyrus_storage -- --include-ignored common_prefix_compare_with_simple_table_random; done

diff --git a/.github/workflows/papyrus_docker-publish.yml b/.github/workflows/papyrus_docker-publish.yml
@@ -3,8 +3,8 @@ name: Papyrus-Docker-Publish
 on:
   workflow_dispatch:
   push:
-    branches: [ main ]
-    tags: [ "v*.*.*" ]
+    branches: [main]
+    tags: ["v*.*.*"]
     paths:
       - '.github/workflows/papyrus_docker-publish.yml'
       - 'crates/papyrus**/**'
@@ -25,7 +25,7 @@ env:
 
 jobs:
   docker-build-push:
-    runs-on: starkware-ubuntu-latest-large
+    runs-on: starkware-ubuntu-latest-medium
 
     steps:
       - name: Checkout repository

diff --git a/.github/workflows/papyrus_nightly-tests-call.yml b/.github/workflows/papyrus_nightly-tests-call.yml
@@ -22,9 +22,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/install_rust
-      - name: Set up Native Dependencies
-        uses: ./.github/actions/setup-native-deps
-        id: native-deps
       - uses: Swatinem/rust-cache@v2
       - run: sudo apt update; sudo apt -y install libclang-dev
         # Install libclang-dev that is not a part of the ubuntu vm in github actions.

diff --git a/.github/workflows/papyrus_nightly-tests.yml b/.github/workflows/papyrus_nightly-tests.yml
@@ -44,10 +44,6 @@ jobs:
 
       - run: brew install protobuf@$PROTOC_VERSION
 
-      - name: Set up Native Dependencies
-        uses: ./.github/actions/setup-native-deps
-        id: native-deps
-
       - name: Build node
         run: cargo build -r -p papyrus_node
 
@@ -62,9 +58,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/install_rust
-      - name: Set up Native Dependencies
-        uses: ./.github/actions/setup-native-deps
-        id: native-deps
       - uses: Swatinem/rust-cache@v2
       - run: npm install -g [email protected]
 
@@ -82,9 +75,6 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/install_rust
       - uses: Swatinem/rust-cache@v2
-      - name: Set up Native Dependencies
-        uses: ./.github/actions/setup-native-deps
-        id: native-deps
       - run: cargo build -r -p papyrus_load_test
 
   integration-test:
@@ -94,9 +84,6 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/install_rust
       - uses: Swatinem/rust-cache@v2
-      - name: Set up Native Dependencies
-        uses: ./.github/actions/setup-native-deps
-        id: native-deps
       - run: >
           cargo test -r
           --test latency_histogram
@@ -113,7 +100,4 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/install_rust
       - uses: Swatinem/rust-cache@v2
-      - name: Set up Native Dependencies
-        uses: ./.github/actions/setup-native-deps
-        id: native-deps
       - run: for run in {1..100}; do cargo test -r -p papyrus_storage -- --include-ignored common_prefix_compare_with_simple_table_random; done
diff --git a/.github/workflows/verify-deps.yml b/.github/workflows/verify-deps.yml
@@ -12,9 +12,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/install_rust
-      - name: Set up Native Dependencies
-        uses: ./.github/actions/setup-native-deps
-        id: native-deps
       - name: Update Dependencies
         run: cargo update --verbose
       - name: Build