Skip to content

Commit 9a6f698

Browse files
authored
Merge branch 'next' into chore/fix-clippy-nursery-warnings
2 parents 349818d + 140385c commit 9a6f698

Some content is hidden

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

66 files changed

+3392
-1154
lines changed

.github/workflows/atlas-tests.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,17 @@ jobs:
5454
uses: stacks-network/actions/codecov@main
5555
with:
5656
test-name: ${{ matrix.test-name }}
57+
58+
check-tests:
59+
name: Check Tests
60+
runs-on: ubuntu-latest
61+
if: always()
62+
needs:
63+
- atlas-tests
64+
steps:
65+
- name: Check Tests Status
66+
id: check_tests_status
67+
uses: stacks-network/actions/check-jobs-status@main
68+
with:
69+
jobs: ${{ toJson(needs) }}
70+
summary_print: "true"

.github/workflows/bitcoin-tests.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ jobs:
7272
- tests::neon_integrations::confirm_unparsed_ongoing_ops
7373
- tests::neon_integrations::min_txs
7474
- tests::neon_integrations::vote_for_aggregate_key_burn_op_test
75+
- tests::epoch_25::microblocks_disabled
7576
- tests::should_succeed_handling_malformed_and_valid_txs
7677
- tests::nakamoto_integrations::simple_neon_integration
7778
- tests::nakamoto_integrations::mine_multiple_per_tenure_integration
@@ -85,6 +86,8 @@ jobs:
8586
- tests::signer::stackerdb_filter_bad_transactions
8687
- tests::signer::stackerdb_mine_2_nakamoto_reward_cycles
8788
- tests::nakamoto_integrations::stack_stx_burn_op_integration_test
89+
# Do not run this one until we figure out why it fails in CI
90+
# - tests::neon_integrations::bitcoin_reorg_flap
8891
steps:
8992
## Setup test environment
9093
- name: Setup Test Environment
@@ -109,3 +112,17 @@ jobs:
109112
uses: stacks-network/actions/codecov@main
110113
with:
111114
test-name: ${{ matrix.test-name }}
115+
116+
check-tests:
117+
name: Check Tests
118+
runs-on: ubuntu-latest
119+
if: always()
120+
needs:
121+
- integration-tests
122+
steps:
123+
- name: Check Tests Status
124+
id: check_tests_status
125+
uses: stacks-network/actions/check-jobs-status@main
126+
with:
127+
jobs: ${{ toJson(needs) }}
128+
summary_print: "true"

.github/workflows/epoch-tests.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,3 +78,17 @@ jobs:
7878
uses: stacks-network/actions/codecov@main
7979
with:
8080
test-name: ${{ matrix.test-name }}
81+
82+
check-tests:
83+
name: Check Tests
84+
runs-on: ubuntu-latest
85+
if: always()
86+
needs:
87+
- epoch-tests
88+
steps:
89+
- name: Check Tests Status
90+
id: check_tests_status
91+
uses: stacks-network/actions/check-jobs-status@main
92+
with:
93+
jobs: ${{ toJson(needs) }}
94+
summary_print: "true"

.github/workflows/github-release.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,7 @@ jobs:
5959
## Generate a checksums file to be added to the release page
6060
- name: Generate Checksums
6161
id: generate_checksum
62-
uses: jmgilman/actions-generate-checksum@24a35957fba81c6cbaefeb1e3d59ee56e3db5077 # v1.0.0
63-
with:
64-
method: sha512
65-
output: CHECKSUMS.txt
66-
patterns: |
67-
release/*.zip
62+
uses: stacks-network/actions/generate-checksum@main
6863

6964
## Upload the release archives with the checksums file
7065
- name: Upload Release

.github/workflows/slow-tests.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,17 @@ jobs:
5656
uses: stacks-network/actions/codecov@main
5757
with:
5858
test-name: ${{ matrix.test-name }}
59+
60+
check-tests:
61+
name: Check Tests
62+
runs-on: ubuntu-latest
63+
if: always()
64+
needs:
65+
- slow-tests
66+
steps:
67+
- name: Check Tests Status
68+
id: check_tests_status
69+
uses: stacks-network/actions/check-jobs-status@main
70+
with:
71+
jobs: ${{ toJson(needs) }}
72+
summary_print: "true"

.github/workflows/stacks-core-tests.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,3 +181,19 @@ jobs:
181181
with:
182182
args: test --manifest-path=./contrib/core-contract-tests/Clarinet.toml contrib/core-contract-tests/tests/bns/name_register_test.ts
183183

184+
check-tests:
185+
name: Check Tests
186+
runs-on: ubuntu-latest
187+
if: always()
188+
needs:
189+
- full-genesis
190+
- unit-tests
191+
- open-api-validation
192+
- core-contracts-clarinet-test
193+
steps:
194+
- name: Check Tests Status
195+
id: check_tests_status
196+
uses: stacks-network/actions/check-jobs-status@main
197+
with:
198+
jobs: ${{ toJson(needs) }}
199+
summary_print: "true"

CONTRIBUTING.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ is responsible for:
5959
6. Merging the new PR.
6060

6161
For an example of this process, see PRs
62-
[#3598](https://github.com/stacks-network/stacks-blockchain/pull/3598) and
63-
[#3626](https://github.com/stacks-network/stacks-blockchain/pull/3626).
62+
[#3598](https://github.com/stacks-network/stacks-core/pull/3598) and
63+
[#3626](https://github.com/stacks-network/stacks-core/pull/3626).
6464

6565

6666
### Documentation Updates
@@ -226,7 +226,7 @@ Contributions should not contain `unsafe` blocks if at all possible.
226226
## Documentation
227227

228228
* Each file must have a **copyright statement**.
229-
* Any new non-test modules should have **module-level documentation** explaining what the module does, and how it fits into the blockchain as a whole ([example](https://github.com/stacks-network/stacks-blockchain/blob/4852d6439b473e24705f14b8af637aded33cb422/testnet/stacks-node/src/neon_node.rs#L17)).
229+
* Any new non-test modules should have **module-level documentation** explaining what the module does, and how it fits into the blockchain as a whole ([example](https://github.com/stacks-network/stacks-core/blob/4852d6439b473e24705f14b8af637aded33cb422/testnet/stacks-node/src/neon_node.rs#L17)).
230230
* Any new files must have some **top-of-file documentation** that describes what the contained code does, and how it fits into the overall module.
231231

232232
Within the source files, the following **code documentation** standards are expected:
@@ -247,7 +247,7 @@ Within the source files, the following **code documentation** standards are expe
247247
handle I/O reads and writes in an "outer" function. The "outer"
248248
function only does the needful I/O and passes the data into the
249249
"inner" function. The "inner" function is often private, whereas
250-
the "outer" function is often public. For example, [`inner_try_mine_microblock` and `try_mine_microblock`](https://github.com/stacks-network/stacks-blockchain/blob/4852d6439b473e24705f14b8af637aded33cb422/testnet/stacks-node/src/neon_node.rs#L1148-L1216).
250+
the "outer" function is often public. For example, [`inner_try_mine_microblock` and `try_mine_microblock`](https://github.com/stacks-network/stacks-core/blob/4852d6439b473e24705f14b8af637aded33cb422/testnet/stacks-node/src/neon_node.rs#L1148-L1216).
251251

252252
## Refactoring
253253

@@ -281,7 +281,7 @@ Within the source files, the following **code documentation** standards are expe
281281
does not decode with the allotted resources, then no further
282282
processing may be done and the data is discarded. For an example, see
283283
how the parsing functions in the http module use `BoundReader` and
284-
`MAX_PAYLOAD_LEN` in [http.rs](https://github.com/stacks-network/stacks-blockchain/blob/4852d6439b473e24705f14b8af637aded33cb422/src/net/http.rs#L2260-L2285).
284+
`MAX_PAYLOAD_LEN` in [http.rs](https://github.com/stacks-network/stacks-core/blob/4852d6439b473e24705f14b8af637aded33cb422/src/net/http.rs#L2260-L2285).
285285

286286
* **All network input reception is time-bound.** Every piece of code that ingests data _from the network_ must impose a maximum amount of time that ingestion can take. If the data takes too long to arrive, then it must be discarded without any further processing. There is no time bound for data ingested from disk or passed as an argument; this requirement is meant by the space-bound requirement.
287287

@@ -303,7 +303,7 @@ Changes to the peer network should be deployed incrementally and tested by multi
303303

304304
Any PRs that claim to improve performance **must ship with reproducible benchmarks** that accurately measure the improvement. This data must also be reported in the PR submission.
305305

306-
For an example, see [PR #3075](https://github.com/stacks-network/stacks-blockchain/pull/3075).
306+
For an example, see [PR #3075](https://github.com/stacks-network/stacks-core/pull/3075).
307307

308308
## Error Handling
309309

@@ -597,7 +597,7 @@ Keep in mind that better variable names can reduce the need for comments, e.g.:
597597

598598
# Licensing and contributor license agreement
599599

600-
`stacks-blockchain` is released under the terms of the GPL version 3. Contributions
600+
`stacks-core` is released under the terms of the GPL version 3. Contributions
601601
that are not licensed under compatible terms will be rejected. Moreover,
602602
contributions will not be accepted unless _all_ authors accept the project's
603603
contributor license agreement.

Cargo.lock

Lines changed: 112 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)