Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ESMX git update for existing component #161

Merged
merged 1 commit into from
Jul 13, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/addon/ESMX/Driver/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -211,25 +211,25 @@ foreach(CMP IN ITEMS ${COMPS})
WORKING_DIRECTORY ${CMP_GIT_DIR}
RESULT_VARIABLE ret
)
esmx_check_err(${ret} "git set-url failed for ${CMP}")
esmx_check_ret(${ret} "git set-url failed for ${CMP}")
execute_process(
COMMAND git fetch origin
WORKING_DIRECTORY ${CMP_GIT_DIR}
RESULT_VARIABLE ret
)
esmx_check_err(${ret} "git fetch failed for ${CMP}")
esmx_check_ret(${ret} "git fetch failed for ${CMP}")
execute_process(
COMMAND git checkout ${CMP_GIT_TAG}
WORKING_DIRECTORY ${CMP_GIT_DIR}
RESULT_VARIABLE ret
)
esmx_check_err(${ret} "git checkout failed for ${CMP}")
esmx_check_ret(${ret} "git checkout failed for ${CMP}")
execute_process(
COMMAND git pull origin ${CMP_GIT_TAG}
WORKING_DIRECTORY ${CMP_GIT_DIR}
RESULT_VARIABLE ret
)
esmx_check_err(${ret} "git pull failed for ${CMP}")
esmx_check_ret(${ret} "git pull failed for ${CMP}")
endif()
endif()

Expand Down