Skip to content

Commit b861bba

Browse files
authored
Merge branch 'compatible' into georgeee/signkind-out-of-transcation
2 parents f153b85 + be23f5a commit b861bba

File tree

9 files changed

+617
-585
lines changed

9 files changed

+617
-585
lines changed

buildkite/scripts/merges-cleanly.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ fi
2121
# Fetch a fresh copy of the target branch
2222
source buildkite/scripts/refresh_code.sh
2323

24+
git fetch origin "${BRANCH}"
25+
2426
# Check mergeability. We use flags so that
2527
# * `--no-commit` stops us from updating the index with a merge commit,
2628
# * `--no-ff` stops us from updating the index to the HEAD, if the merge is a

buildkite/src/Command/Rosetta/Connectivity.dhall

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ let Profiles = ../../Constants/Profiles.dhall
2626

2727
let B/SoftFail = B.definitions/commandStep/properties/soft_fail/Type
2828

29+
let B/If = B.definitions/commandStep/properties/if/Type
30+
2931
let Spec =
3032
{ Type =
3133
{ dockerType : Dockers.Type
@@ -35,6 +37,7 @@ let Spec =
3537
, timeout : Natural
3638
, profile : Profiles.Type
3739
, scope : List PipelineScope.Type
40+
, if : B/If
3841
}
3942
, default =
4043
{ dockerType = Dockers.Type.Bullseye
@@ -44,6 +47,8 @@ let Spec =
4447
, timeout = 1000
4548
, profile = Profiles.Type.Devnet
4649
, scope = PipelineScope.Full
50+
, if =
51+
"build.pull_request.base_branch != \"develop\" || build.branch == \"develop\""
4752
}
4853
}
4954

@@ -68,6 +73,7 @@ let command
6873
"rosetta-${Network.lowerName spec.network}-connectivity-test"
6974
, target = Size.XLarge
7075
, soft_fail = Some spec.softFail
76+
, if = Some spec.if
7177
, depends_on =
7278
Dockers.dependsOn
7379
Dockers.DepsSpec::{

nix/pin.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
# Find the root of the Mina repo
55
ROOT=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )"/.. &> /dev/null && pwd )
66
# Update the submodules
7-
pushd "$ROOT" && git submodule sync && git submodule update --init --recursive && popd
7+
pushd "$ROOT" && git submodule sync && git submodule update --init --recursive --depth 1 && popd
88
# Add the flake registry entry
99
nix registry add mina "git+file://$ROOT?submodules=1"

0 commit comments

Comments
 (0)