Skip to content

Commit 613583d

Browse files
committed
Merge branch 'develop' into feat/execution_time_expired
2 parents f56bce3 + dffe26d commit 613583d

Some content is hidden

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

47 files changed

+1583
-496
lines changed

.cargo/config.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,3 @@ clippy-stacks = "clippy -p libstackerdb -p stacks-signer -p pox-locking -p clari
1212
#[target.x86_64-unknown-linux-gnu]
1313
#linker = "/usr/bin/clang"
1414
#rustflags = ["-Clink-arg=-fuse-ld=lld", "-Clink-arg=-Wl,--no-rosegment"]
15-

.dockerignore

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
11
Dockerfile*
22
target
3-
integration_tests/blockstack-consensus-data/
4-
integration_tests/test-out/
5-
api/data
6-
.git
7-
.venv
83
.dockerignore
9-
testnet/index.html
10-
testnet.log
11-
testnet-logs*
12-
legacy
13-
build-scripts
14-
dist

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

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

.github/workflows/clarity-js-sdk-pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
steps:
2929
- name: Checkout latest clarity js sdk
3030
id: git_checkout
31-
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
31+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3232
with:
3333
token: ${{ secrets.GH_TOKEN }}
3434
repository: ${{ env.CLARITY_JS_SDK_REPOSITORY }}
@@ -46,7 +46,7 @@ jobs:
4646

4747
- name: Create Pull Request
4848
id: create_pr
49-
uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # v6.0.5
49+
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7.0.6
5050
with:
5151
token: ${{ secrets.GH_TOKEN }}
5252
commit-message: "chore: update clarity-native-bin tag"

.github/workflows/clippy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ jobs:
2222
steps:
2323
- name: Checkout the latest code
2424
id: git_checkout
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2626
- name: Define Rust Toolchain
2727
id: define_rust_toolchain
2828
run: echo "RUST_TOOLCHAIN=$(cat ./rust-toolchain)" >> $GITHUB_ENV
2929
- name: Setup Rust Toolchain
3030
id: setup_rust_toolchain
31-
uses: actions-rust-lang/setup-rust-toolchain@v1
31+
uses: actions-rust-lang/setup-rust-toolchain@11df97af8e8102fd60b60a77dfbf58d40cd843b8 # v1.10.1
3232
with:
3333
toolchain: ${{ env.RUST_TOOLCHAIN }}
3434
components: clippy

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ jobs:
1212
steps:
1313
- name: Checkout the latest code
1414
id: git_checkout
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1616
- name: Define Rust Toolchain
1717
id: define_rust_toolchain
1818
run: echo "RUST_TOOLCHAIN=$(cat ./rust-toolchain)" >> $GITHUB_ENV
1919
- name: Setup Rust Toolchain
2020
id: setup_rust_toolchain
21-
uses: actions-rust-lang/setup-rust-toolchain@v1
21+
uses: actions-rust-lang/setup-rust-toolchain@11df97af8e8102fd60b60a77dfbf58d40cd843b8 # v1.10.1
2222
with:
2323
toolchain: ${{ env.RUST_TOOLCHAIN }}
2424
- name: Build the binaries

.github/workflows/github-release.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,3 +142,21 @@ jobs:
142142
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
143143
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
144144
dist: ${{ matrix.dist }}
145+
146+
## Create the downstream PR for the release branch to master,develop
147+
create-pr:
148+
if: |
149+
inputs.node_tag != '' ||
150+
inputs.signer_tag != ''
151+
name: Create Downstream PR (${{ github.ref_name }})
152+
runs-on: ubuntu-latest
153+
needs:
154+
- build-binaries
155+
- create-release
156+
- docker-image
157+
steps:
158+
- name: Open Downstream PR
159+
id: create-pr
160+
uses: stacks-network/actions/stacks-core/release/downstream-pr@main
161+
with:
162+
token: ${{ secrets.GH_TOKEN }}

.github/workflows/image-build-source.yml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@ jobs:
2121
image:
2222
name: Build Image
2323
runs-on: ubuntu-latest
24-
strategy:
25-
fail-fast: false
26-
## Build a maximum of 2 images concurrently based on matrix.dist
27-
max-parallel: 2
28-
matrix:
29-
dist:
30-
- debian
3124
steps:
3225
## Setup Docker for the builds
3326
- name: Docker setup
@@ -49,7 +42,7 @@ jobs:
4942
## Set docker metatdata
5043
- name: Docker Metadata ( ${{matrix.dist}} )
5144
id: docker_metadata
52-
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 #v5.5.1
45+
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 #v5.6.1
5346
with:
5447
images: |
5548
${{env.docker-org}}/${{ github.event.repository.name }}
@@ -61,9 +54,9 @@ jobs:
6154
## Build docker image
6255
- name: Build and Push ( ${{matrix.dist}} )
6356
id: docker_build
64-
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
57+
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
6558
with:
66-
file: ./.github/actions/dockerfiles/Dockerfile.${{matrix.dist}}-source
59+
file: ./Dockerfile
6760
platforms: ${{ env.docker_platforms }}
6861
tags: ${{ steps.docker_metadata.outputs.tags }}
6962
labels: ${{ steps.docker_metadata.outputs.labels }}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
## checkout the code
7979
- name: Checkout the latest code
8080
id: git_checkout
81-
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
81+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
8282

8383
- name: Run network relay tests
8484
id: nettest
@@ -96,10 +96,10 @@ jobs:
9696
steps:
9797
- name: Checkout the latest code
9898
id: git_checkout
99-
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
99+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
100100
- name: Execute core contract unit tests with clarinet-sdk
101101
id: clarinet_unit_test
102-
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
102+
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
103103
with:
104104
node-version: 18.x
105105
cache: "npm"
@@ -125,7 +125,7 @@ jobs:
125125
steps:
126126
- name: Checkout the latest code
127127
id: git_checkout
128-
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
128+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
129129
- name: Execute core contract unit tests in Clarinet
130130
id: clarinet_unit_test_v1
131131
uses: docker://hirosystems/clarinet:1.7.1

.rustfmt.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
group_imports = "StdExternalCrate"
2+
imports_granularity = "Module"

0 commit comments

Comments
 (0)