Commit 78f90dbc authored by Eric Timmons's avatar Eric Timmons
Browse files

Fix ci to checkout tags correctly

parent 574453ba

.gitlab-ci.yml

+10 −2
Original line number Diff line number Diff line
@@ -102,7 +102,10 @@ debian-image:arm: 
    # This looks a little funky, but only one of

    # $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME and $CI_COMMIT_BRANCH will ever be

    # defined at once.

    - git checkout -B $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME $CI_COMMIT_BRANCH $CI_COMMIT_SHA

    - |

      if [ -z "$CI_COMMIT_TAG" ]; then

        git checkout -B $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME $CI_COMMIT_BRANCH $CI_COMMIT_SHA

      fi



.git-repo-needed:windows:

  variables:
@@ -113,7 +116,12 @@ debian-image:arm: 
    # This looks a little funky, but only one of

    # $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME and $CI_COMMIT_BRANCH will ever be

    # defined at once.

    - git checkout -B $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME $CI_COMMIT_BRANCH $CI_COMMIT_SHA

    - |

      if ($CI_COMMIT_TAG) {

        git checkout $CI_COMMIT_TAG

      } else {

        git checkout -B $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME $CI_COMMIT_BRANCH $CI_COMMIT_SHA

      }

    - git submodule init

    - git submodule update