Skip to content

Commit dac754a

Browse files
authored
Merge branch 'master' into define-trait-wording-change
2 parents 8461714 + 62c7e4d commit dac754a

31 files changed

+1399
-1016
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,19 @@
33
Pull requests are ideal for making small changes to this project. However, they are NOT an appropriate venue to introducing non-trivial or breaking changes to the codebase.
44
55
For introducing non-trivial or breaking changes to the codebase, please follow the SIP (Stacks Improvement Proposal) process documented here:
6-
https://github.com/blockstack/stacks-blockchain/blob/master/sip/sip-000-stacks-improvement-proposal-process.md.
6+
https://github.com/stacksgov/sips/blob/main/sips/sip-000/sip-000-stacks-improvement-proposal-process.md.
77
-->
88

99
### Description
1010

1111
### Applicable issues
12+
1213
- fixes #
1314

1415
### Additional info (benefits, drawbacks, caveats)
1516

1617
### Checklist
18+
1719
- [ ] Test coverage for new or modified code paths
1820
- [ ] Changelog is updated
1921
- [ ] Required documentation changes (e.g., `docs/rpc/openapi.yaml` and `rpc-endpoints.md` for v2 endpoints, `event-dispatcher.md` for new events)

.github/actions/dockerfiles/Dockerfile.alpine-binary

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ ARG TARGETPLATFORM
77
ARG BUILDPLATFORM
88
ARG TARGETARCH
99
ARG TARGETVARIANT
10-
ARG REPO=stacks-network/stacks-blockchain
10+
ARG REPO=stacks-network/stacks-core
1111

1212
RUN case ${TARGETARCH} in \
1313
"amd64") BIN_ARCH=linux-musl-x64 ;; \
1414
"arm64") BIN_ARCH=linux-musl-arm64 ;; \
15+
"arm") BIN_ARCH=linux-musl-armv7 ;; \
1516
"*") exit 1 ;; \
1617
esac \
1718
&& echo "wget -q https://github.com/${REPO}/releases/download/${TAG}/${BIN_ARCH}.zip -O /${BIN_ARCH}.zip" \

.github/actions/dockerfiles/Dockerfile.debian-binary

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ ARG TARGETPLATFORM
77
ARG BUILDPLATFORM
88
ARG TARGETARCH
99
ARG TARGETVARIANT
10-
ARG REPO=stacks-network/stacks-blockchain
10+
ARG REPO=stacks-network/stacks-core
1111

1212
RUN case ${TARGETARCH} in \
1313
"amd64") BIN_ARCH=linux-musl-x64 ;; \
1414
"arm64") BIN_ARCH=linux-musl-arm64 ;; \
15+
"arm") BIN_ARCH=linux-musl-armv7 ;; \
1516
"*") exit 1 ;; \
1617
esac \
1718
&& echo "wget -q https://github.com/${REPO}/releases/download/${TAG}/${BIN_ARCH}.zip -O /${BIN_ARCH}.zip" \

.github/workflows/atlas-tests.yml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
## Github workflow to run atlas tests
2+
3+
name: Tests::Atlas
4+
5+
on:
6+
workflow_call:
7+
8+
## env vars are transferred to composite action steps
9+
env:
10+
BITCOIND_TEST: 1
11+
RUST_BACKTRACE: full
12+
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 15
13+
TEST_TIMEOUT: 30
14+
15+
concurrency:
16+
group: atlas-tests-${{ github.head_ref || github.ref || github.run_id}}
17+
## Only cancel in progress if this is for a PR
18+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
19+
20+
jobs:
21+
# Atlas integration tests with code coverage
22+
atlas-tests:
23+
name: Atlas Test
24+
runs-on: ubuntu-latest
25+
strategy:
26+
## Continue with the test matrix even if we've had a failure
27+
fail-fast: false
28+
## Run a maximum of 2 concurrent tests from the test matrix
29+
max-parallel: 2
30+
matrix:
31+
test-name:
32+
- tests::neon_integrations::atlas_integration_test
33+
- tests::neon_integrations::atlas_stress_integration_test
34+
steps:
35+
## Setup test environment
36+
- name: Setup Test Environment
37+
id: setup_tests
38+
uses: stacks-network/actions/stacks-core/testenv@main
39+
40+
## Run test matrix using restored cache of archive file
41+
## - Test will timeout after env.TEST_TIMEOUT minutes
42+
- name: Run Tests
43+
id: run_tests
44+
timeout-minutes: ${{ fromJSON(env.TEST_TIMEOUT) }}
45+
uses: stacks-network/actions/stacks-core/run-tests@main
46+
with:
47+
test-name: ${{ matrix.test-name }}
48+
49+
## Create and upload code coverage file
50+
- name: Code Coverage
51+
id: codecov
52+
uses: stacks-network/actions/codecov@main
53+
with:
54+
test-name: ${{ matrix.test-name }}

.github/workflows/audit.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)