Skip to content
Snippets Groups Projects
Commit 0fcb54be authored by Simon Rose's avatar Simon Rose
Browse files

E3-1350: Fix wrapper CI

Due to the patch fix (see
e3/wrappers/e3-require@a94a06b1),
we need to be more specific about the variables that we fetch from
`make vars`. In a sense, we were lucky until this point that no
other variables showed up with suffixes or prefixes.
parent 8536e426
No related branches found
No related tags found
No related merge requests found
Pipeline #185135 failed
......@@ -48,11 +48,11 @@ check-submodule:
script:
- |
set +e # This is to avoid the grep exit code for local modules
submodule_var=$(make vars | grep "EPICS_MODULE_TAG")
submodule_var=$(make vars | grep "^EPICS_MODULE_TAG\b")
if [ -n "$submodule_var" ]; then
git submodule update --init
submodule_name=$(make vars | grep "E3_MODULE_SRC_PATH" | awk -F' ' '{print $3}')
submodule_tag=$(make vars | grep "EPICS_MODULE_TAG" | awk -F' ' '{print $3}')
submodule_name=$(make vars | grep "^E3_MODULE_SRC_PATH\b" | awk -F' ' '{print $3}')
submodule_tag=$(make vars | grep "^EPICS_MODULE_TAG\b" | awk -F' ' '{print $3}')
if [ -n "$submodule_name" ]; then
cd "$submodule_name"
now_version=$(git rev-parse --short HEAD)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment