Skip to content

Commit b2ec4f0

Browse files
authored
Merge branch 'main' into feat-simplify-gas-price-oracle
2 parents 2814adc + c030533 commit b2ec4f0

15 files changed

+14555
-4
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
!/bin
66
!/crates
77
!/testing
8+
!/tests
89
!book.toml
910
!Cargo.lock
1011
!Cargo.toml

.github/workflows/lint.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,11 @@ jobs:
128128
- type: wasm
129129
target: wasm32-unknown-unknown
130130
exclude: |
131-
scroll-engine,scroll-wire,rollup-node,scroll-network,rollup-node-manager,rollup-node-watcher,scroll-db,scroll-migration,rollup-node-indexer,scroll-codec,scroll-derivation-pipeline,rollup-node-providers,rollup-node-sequencer,rollup-node-signer
131+
scroll-engine,scroll-wire,rollup-node,scroll-network,rollup-node-manager,rollup-node-watcher,scroll-db,scroll-migration,rollup-node-indexer,scroll-codec,scroll-derivation-pipeline,rollup-node-providers,rollup-node-sequencer,rollup-node-signer,tests
132132
- type: riscv
133133
target: riscv32imac-unknown-none-elf
134134
exclude: |
135-
scroll-engine,scroll-wire,rollup-node,scroll-network,rollup-node-manager,rollup-node-watcher,scroll-db,scroll-migration,rollup-node-indexer,scroll-codec,scroll-derivation-pipeline,rollup-node-providers,rollup-node-sequencer,rollup-node-signer
135+
scroll-engine,scroll-wire,rollup-node,scroll-network,rollup-node-manager,rollup-node-watcher,scroll-db,scroll-migration,rollup-node-indexer,scroll-codec,scroll-derivation-pipeline,rollup-node-providers,rollup-node-sequencer,rollup-node-signer,tests
136136
steps:
137137
- uses: actions/checkout@v4
138138
- uses: rui314/setup-mold@v1

.github/workflows/test.yaml

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,47 @@ jobs:
5353
- name: Run integration tests
5454
run: |
5555
cargo nextest run --all-features --workspace --locked \
56-
--no-tests=pass -E 'kind(test)' \
56+
--no-tests=pass -E 'kind(test) and not test(docker)' \
5757
-- --skip test_should_consolidate_to_block_15k
58+
59+
integration-docker-compose:
60+
runs-on: ubuntu-latest
61+
timeout-minutes: 90
62+
env:
63+
RUST_BACKTRACE: 1
64+
steps:
65+
- uses: actions/checkout@v4
66+
- uses: rui314/setup-mold@v1
67+
- uses: dtolnay/rust-toolchain@stable
68+
- uses: Swatinem/rust-cache@v2
69+
with:
70+
cache-on-failure: true
71+
- uses: taiki-e/install-action@v2
72+
with:
73+
74+
- name: Set up Docker Buildx
75+
uses: docker/setup-buildx-action@v3
76+
- name: Free up disk space
77+
run: |
78+
echo "Initial disk usage:"
79+
df -h
80+
sudo rm -rf /usr/share/dotnet || true
81+
sudo rm -rf /opt/ghc || true
82+
sudo rm -rf /usr/local/share/boost || true
83+
sudo rm -rf "$AGENT_TOOLSDIRECTORY" || true
84+
sudo rm -rf /usr/local/lib/android || true
85+
sudo rm -rf /usr/local/share/powershell || true
86+
sudo rm -rf /usr/share/swift || true
87+
sudo rm -rf /opt/hostedtoolcache || true
88+
echo "Disk usage after cleanup:"
89+
df -h
90+
- name: Run Docker Compose integration tests
91+
run: |
92+
cargo nextest run --all-features --workspace --locked \
93+
--no-tests=pass -E 'test(docker)' --test-threads=1 \
94+
--failure-output immediate \
95+
--success-output never \
96+
--verbose
97+
env:
98+
RUST_LOG: debug
99+
RUST_BACKTRACE: full

0 commit comments

Comments
 (0)