Pier Angelo Vendrame pushed to branch mullvad-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser

Commits:

1 changed file:

Changes:

  • .gitlab/ci/mixins.yml
    ... ... @@ -4,7 +4,7 @@
    4 4
       before_script:
    
    5 5
         - git init
    
    6 6
         - git remote add local "$LOCAL_REPO_PATH"
    
    7
    -    - git fetch --depth 500 local
    
    7
    +    - git fetch --depth 500 local ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_TARGET_BRANCH_NAME}
    
    8 8
         - git remote add origin "$CI_REPOSITORY_URL"
    
    9 9
         - |
    
    10 10
           if [ -z "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" ]; then
    
    ... ... @@ -26,7 +26,12 @@
    26 26
       before_script:
    
    27 27
         - git init
    
    28 28
         - git remote add local $env:LOCAL_REPO_PATH
    
    29
    -    - git fetch --depth 500 local
    
    29
    +    - |
    
    30
    +      $branchName = $env:CI_COMMIT_BRANCH
    
    31
    +      if ([string]::IsNullOrEmpty($branchName)) {
    
    32
    +          $branchName = $env:CI_MERGE_REQUEST_TARGET_BRANCH_NAME
    
    33
    +      }
    
    34
    +      git fetch --depth 500 local $branchName
    
    30 35
         - git remote add origin $env:CI_REPOSITORY_URL
    
    31 36
         - |
    
    32 37
           $branchName = $env:CI_COMMIT_BRANCH