Skip to content

Commit

Permalink
Merge branch 'master' into feat/advanced-load-elimination
Browse files Browse the repository at this point in the history
  • Loading branch information
charles-cooper authored Jan 31, 2025
2 parents 25bd912 + 1b0fa5b commit d7b72f7
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 14 deletions.
20 changes: 8 additions & 12 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -271,20 +271,16 @@ jobs:
run: |
coverage xml
- name: Upload coverage sqlite artifact
- name: Upload coverage artifacts
# upload coverage sqlite db for debugging
# upload coverage.xml artifact for downstream codecov upload action
uses: actions/upload-artifact@v4
with:
name: coverage-sqlite
name: coverage-artifacts
include-hidden-files: true
path: .coverage
if-no-files-found: error

- name: Upload coverage.xml
uses: actions/upload-artifact@v4
with:
name: coverage-xml
path: coverage.xml
path: |
.coverage
coverage.xml
if-no-files-found: error

upload-coverage:
Expand All @@ -296,10 +292,10 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
name: coverage-xml
name: coverage-artifacts

- name: Upload Coverage
uses: codecov/codecov-action@v5
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: coverage.xml
files: coverage.xml
2 changes: 1 addition & 1 deletion FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
custom: https://etherscan.io/address/0x70CCBE10F980d80b7eBaab7D2E3A73e87D67B775
custom: ["https://etherscan.io/address/0x70CCBE10F980d80b7eBaab7D2E3A73e87D67B775", "https://giveth.io/project/vyper"]
2 changes: 1 addition & 1 deletion vyper/cli/vyper_compile.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from vyper.typing import ContractPath, OutputFormats
from vyper.utils import uniq

format_options_help = """Format to print, one or more of:
format_options_help = """Format to print, one or more of (comma-separated):
bytecode (default) - Deployable bytecode
bytecode_runtime - Bytecode at runtime
blueprint_bytecode - Deployment bytecode for an ERC-5202 compatible blueprint
Expand Down

0 comments on commit d7b72f7

Please sign in to comment.