Skip to content

Commit a58ac52

Browse files
authored
Merge pull request #5990 from wileyj/chore/update_environment
chore: A few workflow fixes
2 parents 4e57e4d + f9a31bd commit a58ac52

File tree

3 files changed

+23
-3
lines changed

3 files changed

+23
-3
lines changed

.github/workflows/github-release.yml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,21 @@ concurrency:
3838
run-name: ${{ inputs.node_tag || inputs.signer_tag }}
3939

4040
jobs:
41+
## This job's sole purpose is trigger a secondary approval outside of the matrix jobs below.
42+
## - If this job isn't approved to run, then the subsequent jobs will also not run - for this reason, we always exit 0
43+
## - `andon-cord` requires the repo environment "Build Release", which will trigger a secondary approval step before running this workflow.
44+
andon-cord:
45+
if: |
46+
inputs.node_tag != '' ||
47+
inputs.signer_tag != ''
48+
name: Andon Cord
49+
runs-on: ubuntu-latest
50+
environment: "Build Release"
51+
steps:
52+
- name: Check Approval
53+
id: check
54+
run: |
55+
exit 0
4156
## Build arch dependent binaries from source
4257
##
4358
## Runs when the following is true:
@@ -48,7 +63,8 @@ jobs:
4863
inputs.signer_tag != ''
4964
name: Build Binaries
5065
runs-on: ubuntu-latest
51-
environment: "Build Release"
66+
needs:
67+
- andon-cord
5268
strategy:
5369
## Run a maximum of 10 builds concurrently, using the matrix defined in inputs.arch
5470
max-parallel: 10
@@ -91,6 +107,7 @@ jobs:
91107
name: Create Release
92108
runs-on: ubuntu-latest
93109
needs:
110+
- andon-cord
94111
- build-binaries
95112
permissions:
96113
contents: write
@@ -107,7 +124,6 @@ jobs:
107124
is_signer_release: ${{ inputs.is_signer_release }}
108125
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
109126

110-
111127
## Builds arch dependent Docker images from binaries
112128
##
113129
## Note: this step requires the binaries in the create-release step to be uploaded
@@ -120,6 +136,7 @@ jobs:
120136
name: Docker Image (Binary)
121137
runs-on: ubuntu-latest
122138
needs:
139+
- andon-cord
123140
- build-binaries
124141
- create-release
125142
strategy:
@@ -152,6 +169,7 @@ jobs:
152169
name: Create Downstream PR (${{ github.ref_name }})
153170
runs-on: ubuntu-latest
154171
needs:
172+
- andon-cord
155173
- build-binaries
156174
- create-release
157175
- docker-image

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ jobs:
2121
image:
2222
name: Build Image
2323
runs-on: ubuntu-latest
24+
## Requires the repo environment "Push to Docker", which will trigger a secondary approval step before running this workflow.
25+
environment: "Push to Docker"
2426
steps:
2527
## Setup Docker for the builds
2628
- name: Docker setup

contrib/tools/block-replay.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ start_replay() {
195195
starting_block=0 # for the block counter, start at this block
196196
## use these values if `--testing` arg is provided (only replay 1_000 blocks) Note: 2.5 epoch is at 153106
197197
${TESTING} && total_blocks=153000
198-
${TESTING} && starting_block=15200
198+
${TESTING} && starting_block=152000
199199
;;
200200
esac
201201
local block_diff=$((total_blocks - starting_block)) ## how many blocks are being replayed

0 commit comments

Comments
 (0)