Skip to content

Commit

Permalink
Merge branch 'unstable' of https://github.com/sigp/lighthouse into je…
Browse files Browse the repository at this point in the history
…malloc

� Conflicts:
�	Cargo.lock
�	beacon_node/http_metrics/Cargo.toml
�	beacon_node/network/src/attestation_service/tests/mod.rs
  • Loading branch information
realbigsean committed Feb 12, 2021
2 parents ff14ee0 + e2ff9c6 commit 5e968df
Show file tree
Hide file tree
Showing 118 changed files with 1,771 additions and 1,945 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Please provide a brief description of the issue.
## Version

Please provide your Lighthouse and Rust version. Are you building from
`master`, which commit?
`stable` or `unstable`, which commit?

## Present Behaviour

Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/test-suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: test-suite
on:
push:
branches:
- master
- stable
- staging
- trying
- 'pr/*'
Expand All @@ -12,6 +12,13 @@ env:
# Deny warnings in CI
RUSTFLAGS: "-D warnings"
jobs:
target-branch-check:
name: target-branch-check
runs-on: ubuntu-latest
if: github.event_name == 'pull_request'
steps:
- name: Check that pull request is targeting unstable branch
run: test ${{ github.base_ref }} = "unstable"
cargo-fmt:
name: cargo-fmt
runs-on: ubuntu-latest
Expand Down
Loading

0 comments on commit 5e968df

Please sign in to comment.