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

Commits:

3 changed files:

Changes:

  • .gitlab-ci.yml
    ... ... @@ -7,5 +7,6 @@ variables:
    7 7
       LOCAL_REPO_PATH: /srv/apps-repos/tor-browser.git
    
    8 8
     
    
    9 9
     include:
    
    10
    +  - local: '.gitlab/ci/mixins.yml'
    
    10 11
       - local: '.gitlab/ci/jobs/lint/lint.yml'
    
    11 12
       - local: '.gitlab/ci/jobs/update-translations.yml'

  • .gitlab/ci/jobs/lint/lint.yml
    1 1
     .base:
    
    2
    +  extends: .with-local-repo-bash
    
    2 3
       stage: lint
    
    3 4
       image: $IMAGE_PATH
    
    4 5
       interruptible: true
    
    5 6
       variables:
    
    6 7
         MOZBUILD_STATE_PATH: "$CI_PROJECT_DIR/.cache/mozbuild"
    
    7
    -    # A copy of the repository already is available in the runner.
    
    8
    -    GIT_STRATEGY: "none"
    
    9 8
       cache:
    
    10 9
         paths:
    
    11 10
           - node_modules
    
    ... ... @@ -17,19 +16,6 @@
    17 16
       tags:
    
    18 17
         # Run these jobs in the browser dedicated runners.
    
    19 18
         - firefox
    
    20
    -  before_script:
    
    21
    -    - git init
    
    22
    -    - git remote add local "$LOCAL_REPO_PATH"
    
    23
    -    - git fetch --depth 500 local
    
    24
    -    - git remote add origin "$CI_REPOSITORY_URL"
    
    25
    -    - |
    
    26
    -      if [ -z "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" ]; then
    
    27
    -          echo "No branch specified. Stopping the pipeline."
    
    28
    -          exit 1
    
    29
    -      fi
    
    30
    -    - echo "Fetching from remote branch ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"
    
    31
    -    - git fetch origin "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"
    
    32
    -    - git checkout origin/${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}
    
    33 19
     
    
    34 20
     eslint:
    
    35 21
       extends: .base
    

  • .gitlab/ci/mixins.yml
    1
    +.with-local-repo-bash:
    
    2
    +  variables:
    
    3
    +      GIT_STRATEGY: "none"
    
    4
    +  before_script:
    
    5
    +    - git init
    
    6
    +    - git remote add local "$LOCAL_REPO_PATH"
    
    7
    +    - git fetch --depth 500 local
    
    8
    +    - git remote add origin "$CI_REPOSITORY_URL"
    
    9
    +    - |
    
    10
    +      if [ -z "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" ]; then
    
    11
    +          echo "No branch specified. Stopping the pipeline."
    
    12
    +          exit 1
    
    13
    +      fi
    
    14
    +    - echo "Fetching from remote branch ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"
    
    15
    +    - |
    
    16
    +      if ! git fetch origin "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"; then
    
    17
    +            echo -e "\e[31mFetching failed for branch ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME} from $CI_REPOSITORY_URL.\e[0m"
    
    18
    +            echo "Attempting to fetch the merge request branch, assuming this pipeline is not running in a fork."
    
    19
    +            git fetch origin "merge-requests/${CI_MERGE_REQUEST_IID}/head"
    
    20
    +      fi
    
    21
    +    - git checkout origin/${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}
    
    22
    +
    
    23
    +.with-local-repo-pwsh:
    
    24
    +  variables:
    
    25
    +      GIT_STRATEGY: "none"
    
    26
    +  before_script:
    
    27
    +    - git init
    
    28
    +    - git remote add local $env:LOCAL_REPO_PATH
    
    29
    +    - git fetch --depth 500 local
    
    30
    +    - git remote add origin $env:CI_REPOSITORY_URL
    
    31
    +    - |
    
    32
    +      $branchName = $env:CI_COMMIT_BRANCH
    
    33
    +      if ([string]::IsNullOrEmpty($branchName)) {
    
    34
    +          $branchName = $env:CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
    
    35
    +      }
    
    36
    +      if ([string]::IsNullOrEmpty($branchName)) {
    
    37
    +          Write-Output "No branch specified. Stopping the pipeline."
    
    38
    +          exit 1
    
    39
    +      }
    
    40
    +    - Write-Output "Fetching from remote branch $branchName"
    
    41
    +    - |
    
    42
    +      if (! git fetch origin $branchName) {
    
    43
    +        Write-Output "Fetching failed for branch $branchName from $env:CI_REPOSITORY_URL."
    
    44
    +        Write-Output "Attempting to fetch the merge request branch, assuming this pipeline is not running in a fork."
    
    45
    +        git fetch origin "merge-requests/$env:CI_MERGE_REQUEST_IID/head"
    
    46
    +      }
    
    47
    +    - git checkout origin/$branchName