Skip to content

Commit

Permalink
Merge branch 'unstable' into nh/e2e-ci-env
Browse files Browse the repository at this point in the history
  • Loading branch information
nazarhussain authored May 26, 2023
2 parents b536500 + 0207d66 commit 5a23f02
Show file tree
Hide file tree
Showing 129 changed files with 27,063 additions and 18,661 deletions.
5 changes: 4 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ module.exports = {
},
],
"@typescript-eslint/await-thenable": "error",
"@typescript-eslint/return-await": "error",
"@typescript-eslint/naming-convention": [
"error",
{selector: "default", format: ["camelCase"]},
Expand Down Expand Up @@ -134,7 +135,6 @@ module.exports = {
"no-consecutive-blank-lines": 0,
"no-console": "error",
"no-var": "error",
"no-return-await": "error",
"object-curly-spacing": ["error", "never"],
"object-literal-sort-keys": 0,
"no-prototype-builtins": 0,
Expand Down Expand Up @@ -169,6 +169,9 @@ module.exports = {
// TEMP Disabled while eslint-plugin-import support ESM (Typescript does support it) https://github.com/import-js/eslint-plugin-import/issues/2170
"import/no-unresolved": "off",

// superseded by @typescript-eslint/return-await, must be disabled as it can report incorrect errors
"no-return-await": "off",

"@chainsafe/node/file-extension-in-import": ["error", "always", {esm: true}],
},
settings: {
Expand Down
35 changes: 0 additions & 35 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

64 changes: 64 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
name: Bug Report
description: Create a bug report to help us improve
title: "[Descriptive title] "
body:
- type: markdown
attributes:
value: |
**NOTE: General questions should go to the [Discord chat](https://discord.gg/aMxzVcr) instead of the issue tracker.**
- type: textarea
id: describe
attributes:
label: Describe the bug
description: A clear and concise description of what the bug is and steps to reproduce it.
placeholder: This is what I'm seeing.
validations:
required: true
- type: textarea
id: expected
attributes:
label: Expected behavior
description: A clear and concise description of what you expected to happen.
placeholder: This is what should happen.
validations:
required: true
- type: textarea
id: steps
attributes:
label: Steps to reproduce
description: List the steps to reproduce the behavior
placeholder: |
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
validations:
required: false
- type: textarea
id: attachments
attributes:
label: Additional context
description: If applicable, add screenshots, links or other context about the issue
placeholder: |
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
validations:
required: false
- type: dropdown
attributes:
label: Operating system
description: What type of operating system are you running on?
multiple: false
options:
- Linux
- macOS
- Windows
validations:
required: true
- type: input
id: version
attributes:
label: Lodestar version or commit hash
description: Which version or commit hash of Lodestar are you running?
placeholder: v1.8.0 or a4b29cf
validations:
required: true
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blank_issues_enabled: true
contact_links:
- name: Ethereum Bug Bounty
url: https://ethereum.org/en/bug-bounty/
about: Earn up to $250,000 USD and a place on the leaderboard by finding protocol, client and Solidity bugs affecting the Ethereum network.
24 changes: 0 additions & 24 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

33 changes: 33 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Feature request
description: Suggest an idea for this project
title: "[Descriptive title] "
labels: [meta-feature-request]
body:
- type: markdown
attributes:
value: |
**NOTE: General questions should go to the [Discord chat](https://discord.gg/aMxzVcr) instead of the issue tracker.**
- type: textarea
id: problem
attributes:
label: Problem description
description: A clear and concise description of what the problem is.
placeholder: Ex. I'm always frustrated when...
validations:
required: true
- type: textarea
id: solution
attributes:
label: Solution description
description: A clear and concise description of what you want to happen.
placeholder: This is what should happen.
validations:
required: true
- type: textarea
id: context
attributes:
label: Additional context
description: A clear and concise description of alternatives you've considered and add any additional context for the feature request.
placeholder: I've considered alternative solutions and here are links and screenshots about the feature request.
validations:
required: false
13 changes: 0 additions & 13 deletions .github/ISSUE_TEMPLATE/general_question.md

This file was deleted.

7 changes: 5 additions & 2 deletions .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
name: Benchmark

# only one can tun at a time.
# Actions access a common cache entry and may corrupt it.
concurrency: cd-benchmark-${{ github.ref }}
concurrency:
# If PR, cancel prev commits. head_ref = source branch name on pull_request, null if push
# if push, default to github.run_id so retries of the same commit do not overwrite each other
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

on:
push:
Expand Down
60 changes: 32 additions & 28 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@
#
name: "CodeQL"

concurrency:
# If PR, cancel prev commits. head_ref = source branch name on pull_request, null if push
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

on:
push:
branches:
Expand All @@ -22,7 +27,7 @@ on:
- stable
- unstable
schedule:
- cron: '19 21 * * 3'
- cron: "19 21 * * 3"

jobs:
analyze:
Expand All @@ -36,41 +41,40 @@ jobs:
strategy:
fail-fast: false
matrix:
language: [ 'javascript' ]
language: ["javascript"]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

steps:
- name: Checkout repository
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
- name: Checkout repository
uses: actions/checkout@v3

# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh
# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
5 changes: 5 additions & 0 deletions .github/workflows/test-browser.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
name: Browser tests

concurrency:
# If PR, cancel prev commits. head_ref = source branch name on pull_request, null if push
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

on:
push:
# We intentionally don't run push on feature branches. See PR for rational.
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/test-e2e.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
name: E2E tests

concurrency:
# If PR, cancel prev commits. head_ref = source branch name on pull_request, null if push
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

on:
push:
# We intentionally don't run push on feature branches. See PR for rational.
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/test-sim-merge.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
name: Sim merge execution/builder tests

concurrency:
# If PR, cancel prev commits. head_ref = source branch name on pull_request, null if push
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

on:
push:
# We intentionally don't run push on feature branches. See PR for rational.
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/test-sim.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
name: Sim tests

concurrency:
# If PR, cancel prev commits. head_ref = source branch name on pull_request, null if push
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

on:
push:
# We intentionally don't run push on feature branches. See PR for rational.
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/test-spec.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
name: Spec tests

concurrency:
# If PR, cancel prev commits. head_ref = source branch name on pull_request, null if push
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

on:
push:
# We intentionally don't run push on feature branches. See PR for rational.
Expand Down Expand Up @@ -59,5 +64,5 @@ jobs:
run: yarn test:spec-minimal
working-directory: packages/beacon-node
- name: Spec tests mainnet
run: NODE_OPTIONS='--max-old-space-size=4096' yarn test:spec-mainnet
run: NODE_OPTIONS='--max-old-space-size=4096' yarn test:spec-mainnet
working-directory: packages/beacon-node
5 changes: 5 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
name: Tests
# only one can run at a time
concurrency:
# If PR, cancel prev commits. head_ref = source branch name on pull_request, null if push
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

on:
push:
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ packages/beacon-node/trusted_setup.txt
# docker-compose .env file
.env

# Grafana secret
.secrets.env

# Git artifacts
packages/cli/.git-data.json

Expand Down
Loading

0 comments on commit 5a23f02

Please sign in to comment.