Skip to content

Commit efb7480

Browse files
committed
Remove armv7 build and restore order of operations in release workflow
1 parent 37ab5e7 commit efb7480

File tree

1 file changed

+26
-25
lines changed

1 file changed

+26
-25
lines changed

.github/workflows/github-release.yml

+26-25
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ jobs:
6363
- windows
6464
cpu:
6565
- arm64
66-
- armv7
6766
- x86-64 ## defaults to x86-64-v3 variant - intel haswell (2013) and newer
6867
# - x86-64-v2 ## intel nehalem (2008) and newer
6968
# - x86-64-v3 ## intel haswell (2013) and newer
@@ -86,63 +85,65 @@ jobs:
8685
signer_docker_tag: ${{ inputs.signer_docker_tag }}
8786
is_node_release: ${{ inputs.is_node_release }}
8887

89-
## Builds arch dependent Docker images from binaries
90-
##
9188
## Runs when the following is true:
9289
## - either node or signer tag is provided
93-
docker-image:
90+
create-release:
9491
if: |
9592
inputs.node_tag != '' ||
9693
inputs.signer_tag != ''
97-
name: Docker Image (Binary)
94+
name: Create Release
9895
runs-on: ubuntu-latest
9996
needs:
10097
- build-binaries
101-
strategy:
102-
fail-fast: false
103-
## Build a maximum of 2 images concurrently based on matrix.dist
104-
max-parallel: 2
105-
matrix:
106-
dist:
107-
- alpine
108-
- debian
10998
steps:
110-
- name: Create Docker Image
111-
uses: stacks-network/actions/stacks-core/release/docker-images@main
99+
## Creates releases
100+
- name: Create Release
101+
uses: stacks-network/actions/stacks-core/release/create-releases@main
112102
with:
113103
node_tag: ${{ inputs.node_tag }}
114104
node_docker_tag: ${{ inputs.node_docker_tag }}
115105
signer_tag: ${{ inputs.signer_tag }}
116106
signer_docker_tag: ${{ inputs.signer_docker_tag }}
117107
is_node_release: ${{ inputs.is_node_release }}
118108
is_signer_release: ${{ inputs.is_signer_release }}
119-
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
120-
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
121-
dist: ${{ matrix.dist }}
109+
GH_TOKEN: ${{ secrets.GH_TOKEN }}
110+
122111

112+
## Builds arch dependent Docker images from binaries
113+
##
114+
## Note: this step requires the binaries in the create-release step to be uploaded
123115
## Runs when the following is true:
124116
## - either node or signer tag is provided
125-
create-release:
117+
docker-image:
126118
if: |
127119
inputs.node_tag != '' ||
128120
inputs.signer_tag != ''
129-
name: Create Release
121+
name: Docker Image (Binary)
130122
runs-on: ubuntu-latest
131123
needs:
132124
- build-binaries
133-
- docker-image
125+
- create-release
126+
strategy:
127+
fail-fast: false
128+
## Build a maximum of 2 images concurrently based on matrix.dist
129+
max-parallel: 2
130+
matrix:
131+
dist:
132+
- alpine
133+
- debian
134134
steps:
135-
## Creates releases
136-
- name: Create Release
137-
uses: stacks-network/actions/stacks-core/release/create-releases@main
135+
- name: Create Docker Image
136+
uses: stacks-network/actions/stacks-core/release/docker-images@main
138137
with:
139138
node_tag: ${{ inputs.node_tag }}
140139
node_docker_tag: ${{ inputs.node_docker_tag }}
141140
signer_tag: ${{ inputs.signer_tag }}
142141
signer_docker_tag: ${{ inputs.signer_docker_tag }}
143142
is_node_release: ${{ inputs.is_node_release }}
144143
is_signer_release: ${{ inputs.is_signer_release }}
145-
GH_TOKEN: ${{ secrets.GH_TOKEN }}
144+
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
145+
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
146+
dist: ${{ matrix.dist }}
146147

147148
## Create the downstream PR for the release branch to master,develop
148149
create-pr:

0 commit comments

Comments
 (0)