Skip to content

Commit 17c4fa2

Browse files
Merge pull request #885 from openebs/0.0.0_mod_update
[CI] Update git submodules
2 parents 4a66697 + c27dbea commit 17c4fa2

5 files changed

Lines changed: 10 additions & 6 deletions

File tree

.github/bors.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
status = [ "bors-ci" ]
2-
pr_status = [ "helm-chart-test", "helm-images-pr", "submodule-branch", "commitlint", "DCO" ]
2+
pr_status = [ "helm-ci / helm-chart-test", "helm-ci / helm-images-pr", "submodule-branch", "commitlint", "DCO" ]
33
timeout_sec = 10000
44
required_approvals = 2
55
delete_merged_branches = true

scripts/helm/install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,10 @@ while [ "$#" -gt 0 ]; do
195195
done
196196

197197
if [ -n "$VERSION" ] && [ -z "$HOSTED" ]; then
198-
die "The ``--version <vers>` option may be used with the `--hosted-chart` option only"
198+
die "The ``--version <vers>`` option may be used with the ``--hosted-chart`` option only"
199199
fi
200200
if [ -n "$REGISTRY" ] && [ -z "$HOSTED" ]; then
201-
die "The ``--registry <url>` option may be used with the `--hosted-chart` option only"
201+
die "The ``--registry <url>`` option may be used with the ``--hosted-chart`` option only"
202202
fi
203203

204204
DEP_UPDATE_ARG=

scripts/k8s/load-images-to-kind.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,8 @@ for image in "${images[@]}"; do
7070
fi
7171
load_cmd+=" openebs/mayastor-"$image:$IMAGE_TAG
7272
done
73-
eval $load_cmd
73+
if ! eval $load_cmd; then
74+
sleep 5
75+
log_error "Failed to load images, trying again..."
76+
eval $load_cmd
77+
fi

shell.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ pkgs.mkShellNoCC {
6666
fi
6767
export EXTENSIONS_SRC=`pwd`
6868
export CTRL_SRC="$EXTENSIONS_SRC"/dependencies/control-plane
69-
export PATH="$PATH:$(pwd)/target/debug"
69+
export PATH="$(pwd)/target/debug:$PATH"
7070
7171
${lib.optionalString (norust) "cowsay ${norust_moth}"}
7272
${lib.optionalString (norust) "echo"}

0 commit comments

Comments
 (0)