Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
12 changes: 12 additions & 0 deletions .backportrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"repoOwner": "aptos-labs",
"repoName": "aptos-core",

"branchLabelMapping": {
"^v(\\d+).(\\d+)$": "aptos-release-v$1.$2"
},
"commitConflicts": true,
"prTitle": "[cp][{{targetBranch}}] {{sourcePullRequest.title}}",
"targetPRLabels": ["cherry-pick"],
"assignees": ["thepomeranian"]
}
18 changes: 17 additions & 1 deletion .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,29 @@ xclippy = [
"--workspace",
"--all-targets",
"--",
"--check-cfg=cfg(fuzzing)",
"-Wunexpected_cfgs",
"-Dwarnings",
"-Wclippy::all",
"-Wclippy::all", # TODO: at some point we need to clean up all the exceptions listed below
"-Aclippy::upper_case_acronyms",
"-Aclippy::enum-variant-names",
"-Aclippy::result-large-err",
"-Aclippy::mutable-key-type",
"-Aclippy::map_identity", # We temporarily ignore this due to: https://github.com/rust-lang/rust-clippy/issues/11764
"-Aclippy::doc_lazy_continuation",
"-Aclippy::collapsible_match",
"-Aclippy::needless_borrows_for_generic_args",
"-Anon_local_definitions",
"-Aclippy::needless_lifetimes",
"-Aclippy::empty_line_after_doc_comments",
"-Aclippy::manual-ok-err",
"-Aclippy::doc-overindented-list-items",
"-Aclippy::unneeded_struct_pattern",
"-Aclippy::manual_div_ceil",
"-Aclippy::manual-repeat-n",
"-Aclippy::sliced-string-as-bytes",
"-Aclippy::obfuscated-if-else",
"-Aclippy::unnecessary-map-or",
]
x = "run --package aptos-cargo-cli --bin aptos-cargo-cli --"

Expand Down
3 changes: 3 additions & 0 deletions .config/nextest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ status-level = "skip"
failure-output = "immediate-final"
# Cancel test run on the first failure. Accounts for retries.
fail-fast = true
# To avoid CPU saturation and test timeouts (due to heavy/multithreaded
# tests), we increase the number of threads required per test.
threads-required = 3

junit = { path = "junit.xml" }

Expand Down
7 changes: 4 additions & 3 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,18 @@
!**/*.errmap
!config/src/config/test_data
!aptos-move/aptos-gas-profiling/templates/
!aptos-move/aptos-release-builder/data/release.yaml
!aptos-move/aptos-release-builder/data/*.yaml
!aptos-move/aptos-release-builder/data/proposals/*
!aptos-move/framework/
!aptos-move/move-examples/hello_blockchain/
!crates/aptos/src/move_tool/*.bpl
!crates/aptos/src/node/local_testnet/hasura_metadata.json
!crates/aptos-localnet/src/hasura_metadata.json
!crates/aptos-faucet/doc/
!crates/transaction-emitter-lib/src/emitter/test_proofs_for_localnet_txn_emitter.txt
!api/doc/
!crates/indexer/migrations/**/*.sql
!ecosystem/indexer-grpc/indexer-grpc-parser/migrations/**/*.sql
!ecosystem/nft-metadata-crawler-parser/migrations/**/*.sql
!ecosystem/nft-metadata-crawler/migrations/**/*.sql
!rust-toolchain.toml
!scripts/
!terraform/helm/aptos-node/
Expand Down
14 changes: 13 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ target-out-docker
docker/compose/indexer-grpc/data-service-grpc-server.crt
docker/compose/indexer-grpc/data-service-grpc-server.key


# Doc generation output
*.md.old

Expand Down Expand Up @@ -130,6 +129,7 @@ run_*
# test files for indexer GRPC
test_indexer_grpc_*.yaml
test_indexer_grpc/*
ecosystem/indexer-grpc/indexer-transaction-generator/*.yaml

# ignore compiler artifacts
*.dot
Expand All @@ -140,3 +140,15 @@ test_indexer_grpc/*
*supra_history
**/supra_node_logs
aptos-move/framework/supra-framework/doc/supra_poll.md

# ignore antithesis
genesis_antithesis_*/

# ignore cursor rules
.cursor/rules

#ignore proptest regressions
**/proptest_regressions/*

# Ignore generated credentials from google-github-actions/auth
gha-creds-*.json
27 changes: 0 additions & 27 deletions .mailmap

This file was deleted.

3 changes: 3 additions & 0 deletions .watchmanconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"ignore_dirs": ["target"]
}
Loading