Skip to content

Commit 358a8da

Browse files
Merge pull request #10893 from starkware-libs/dori/merge-main-v0.14.1-committer-into-main-1765985317
Merge main-v0.14.1-committer into main
2 parents c5dd1bf + 6b4334d commit 358a8da

File tree

347 files changed

+18462
-15613
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

347 files changed

+18462
-15613
lines changed

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ crates/blockifier_test_utils/resources/feature_contracts/cairo1/sierra/*.json -d
55

66
# Hint coverage of specific test cases do not require review - we use these artifacts to compute the
77
# list of all uncovered hints, which *should* be reviewed.
8-
crates/starknet_os_flow_tests/resources/hint_coverage/*.json -diff
8+
crates/starknet_os/resources/hint_coverage/*.json -diff

.github/workflows/hybrid_system_test.yaml

Lines changed: 0 additions & 404 deletions
This file was deleted.

.github/workflows/sequencer_cdk8s-test.yml

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,26 @@
1-
name: Sequencer-Cdk8s-Test
1+
name: Sequencer CdK8s Dry Test
22
on:
33
workflow_dispatch:
44

5-
# push:
6-
# branches:
7-
# - main
8-
# - main-v[0-9].**
9-
# tags:
10-
# - v[0-9].**
11-
# paths:
12-
# - ".github/workflows/sequencer_cdk8s-test.yml"
13-
# - "deployments/sequencer/**"
14-
15-
# pull_request:
16-
# branches:
17-
# - main
18-
# - main-v[0-9].**
19-
# paths:
20-
# - ".github/workflows/sequencer_cdk8s-test.yml"
21-
# - "deployments/sequencer/**"
5+
pull_request:
6+
branches:
7+
- main
8+
- main-v[0-9].**
9+
paths:
10+
- ".github/workflows/sequencer_cdk8s-test.yml"
11+
- "crates/apollo_deployments/**"
12+
- "deployments/sequencer2/**"
2213

2314
jobs:
2415
prepare:
2516
runs-on: ubuntu-24.04
2617
env:
2718
cluster: test
2819
namespace: test
29-
deployment_config_path: ${{ github.workspace }}/crates/apollo_deployments/resources/deployments/testing/deployment_config_consolidated.json
20+
layout: hybrid
21+
overlay: hybrid.testing.node-0
3022
monitoring_dashboard_file: ${{ github.workspace }}/deployments/monitoring/examples/output/dashboards/sequencer_node_dashboard.json
23+
cdk8s_sequencer_path: ${{ github.workspace }}/deployments/sequencer2
3124

3225
steps:
3326
- name: Checkout sequencer
@@ -52,19 +45,19 @@ jobs:
5245

5346
# Synthesize the CDK8s Sequencer app.
5447
- name: CDk8s synth
55-
working-directory: deployments/sequencer
48+
working-directory: ${{ env.cdk8s_sequencer_path }}
5649
run: |
5750
cdk8s import
5851
pipenv install
59-
cdk8s synth --app "pipenv run python main.py --namespace ${{ env.namespace }} --deployment-config-file ${{ env.deployment_config_path }} --monitoring-dashboard-file ${{ env.monitoring_dashboard_file }} --cluster ${{ env.cluster }}"
52+
cdk8s synth --app "pipenv run python -m main --namespace ${{ env.namespace }} -l ${{ env.layout }} -o ${{ env.overlay }} --monitoring-dashboard-file ${{ env.monitoring_dashboard_file }} --cluster ${{ env.cluster }}"
6053
6154
- name: Upload artifacts
6255
uses: actions/upload-artifact@v4
6356
with:
6457
name: cdk8s-artifacts
6558
path: |
66-
deployments/sequencer/dist
67-
deployments/sequencer/resources
59+
${{ env.cdk8s_sequencer_path }}/dist
60+
${{ env.cdk8s_sequencer_path }}/resources
6861
6962
validate:
7063
runs-on: ubuntu-24.04

.github/workflows/sequencer_cdk8s-test2.yml

Lines changed: 0 additions & 107 deletions
This file was deleted.

0 commit comments

Comments
 (0)