Skip to content

Commit 109c4a5

Browse files
michaelsproulmichaelsproul
committed
Merge remote-tracking branch 'origin/deneb-free-blobs' into tree-states
2 parents f1f76f2 + 57edc0f commit 109c4a5

File tree

253 files changed

+21787
-3118
lines changed

Some content is hidden

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

253 files changed

+21787
-3118
lines changed

‎.github/workflows/docker.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
branches:
66
- unstable
77
- stable
8+
- deneb-free-blobs
89
tags:
910
- v*
1011

@@ -40,6 +41,11 @@ jobs:
4041
run: |
4142
echo "VERSION=latest" >> $GITHUB_ENV
4243
echo "VERSION_SUFFIX=-unstable" >> $GITHUB_ENV
44+
- name: Extract version (if deneb)
45+
if: github.event.ref == 'refs/heads/deneb-free-blobs'
46+
run: |
47+
echo "VERSION=deneb" >> $GITHUB_ENV
48+
echo "VERSION_SUFFIX=" >> $GITHUB_ENV
4349
- name: Extract version (if tagged release)
4450
if: startsWith(github.event.ref, 'refs/tags')
4551
run: |

‎.github/workflows/test-suite.yml‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,16 @@ jobs:
117117
run: rustup update stable
118118
- name: Run operation_pool tests for all known forks
119119
run: make test-op-pool
120+
network-tests:
121+
name: network-tests
122+
runs-on: ubuntu-latest
123+
needs: cargo-fmt
124+
steps:
125+
- uses: actions/checkout@v3
126+
- name: Get latest version of stable Rust
127+
run: rustup update stable
128+
- name: Run network tests for all known forks
129+
run: make test-network
120130
slasher-tests:
121131
name: slasher-tests
122132
runs-on: ubuntu-latest
@@ -322,14 +332,16 @@ jobs:
322332
run: rustup update stable
323333
- name: Run cargo audit to identify known security vulnerabilities reported to the RustSec Advisory Database
324334
run: make audit
325-
cargo-vendor:
326-
name: cargo-vendor
327-
runs-on: ubuntu-latest
328-
needs: cargo-fmt
329-
steps:
330-
- uses: actions/checkout@v3
331-
- name: Run cargo vendor to make sure dependencies can be vendored for packaging, reproducibility and archival purpose
332-
run: CARGO_HOME=$(readlink -f $HOME) make vendor
335+
# TODO(sean): re-enable this when we can figure it out with c-kzg
336+
# Issue: https://github.com/sigp/lighthouse/issues/4440
337+
# cargo-vendor:
338+
# name: cargo-vendor
339+
# runs-on: ubuntu-latest
340+
# needs: cargo-fmt
341+
# steps:
342+
# - uses: actions/checkout@v3
343+
# - name: Run cargo vendor to make sure dependencies can be vendored for packaging, reproducibility and archival purpose
344+
# run: CARGO_HOME=$(readlink -f $HOME) make vendor
333345
cargo-udeps:
334346
name: cargo-udeps
335347
runs-on: ubuntu-latest

‎.gitignore‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ perf.data*
99
/bin
1010
genesis.ssz
1111
/clippy.toml
12+
/.cargo
1213

1314
# IntelliJ
1415
/*.iml
15-
.idea
16+
.idea
17+
18+
# VSCode
19+
/.vscode

0 commit comments

Comments
 (0)