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

Commits:

2 changed files:

Changes:

  • .gitlab-ci.yml
    ... ... @@ -3,7 +3,7 @@ stages:
    3 3
     
    
    4 4
     variables:
    
    5 5
       IMAGE_PATH: containers.torproject.org/tpo/applications/tor-browser/base:latest
    
    6
    -  LOCAL_REPO_PATH: /srv/apps-repos/${CI_PROJECT_NAME}.git
    
    6
    +  LOCAL_REPO_PATH: /srv/apps-repos/tor-browser.git
    
    7 7
     
    
    8 8
     include:
    
    9 9
       - local: '.gitlab/ci/lint.yml'

  • .gitlab/ci/lint.yml
    ... ... @@ -22,7 +22,13 @@
    22 22
         - git remote add local "$LOCAL_REPO_PATH"
    
    23 23
         - git fetch --depth 500 local
    
    24 24
         - git remote add origin "$CI_REPOSITORY_URL"
    
    25
    -    - git fetch origin ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}
    
    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}"
    
    26 32
         - git checkout origin/${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}
    
    27 33
     
    
    28 34
     eslint:
    
    ... ... @@ -52,7 +58,7 @@ eslint:
    52 58
             - 'tools/lint/eslint/eslint-plugin-mozilla/**'
    
    53 59
             - 'tools/lint/eslint/eslint-plugin-spidermonkey-js/**'
    
    54 60
         # Run job whenever a commit is merged to a protected branch
    
    55
    -    - if: $CI_COMMIT_REF_PROTECTED == 'true'
    
    61
    +    - if: ($CI_COMMIT_BRANCH && $CI_COMMIT_REF_PROTECTED == 'true')
    
    56 62
     
    
    57 63
     stylelint:
    
    58 64
       extends: .base
    
    ... ... @@ -70,7 +76,7 @@ stylelint:
    70 76
             - '**/.stylelintignore'
    
    71 77
             - '**/*stylelintrc*'
    
    72 78
         # Run job whenever a commit is merged to a protected branch
    
    73
    -    - if: $CI_COMMIT_REF_PROTECTED == 'true'
    
    79
    +    - if: ($CI_COMMIT_BRANCH && $CI_COMMIT_REF_PROTECTED == 'true')
    
    74 80
     
    
    75 81
     py-black:
    
    76 82
       extends: .base
    
    ... ... @@ -89,7 +95,7 @@ py-black:
    89 95
             - 'pyproject.toml'
    
    90 96
             - 'tools/lint/black.yml'
    
    91 97
         # Run job whenever a commit is merged to a protected branch
    
    92
    -    - if: $CI_COMMIT_REF_PROTECTED == 'true'
    
    98
    +    - if: ($CI_COMMIT_BRANCH && $CI_COMMIT_REF_PROTECTED == 'true')
    
    93 99
     
    
    94 100
     py-ruff:
    
    95 101
       extends: .base
    
    ... ... @@ -108,7 +114,7 @@ py-ruff:
    108 114
             - 'tools/lint/python/ruff.py'
    
    109 115
             - 'tools/lint/python/ruff_requirements.txt'
    
    110 116
         # Run job whenever a commit is merged to a protected branch
    
    111
    -    - if: $CI_COMMIT_REF_PROTECTED == 'true'
    
    117
    +    - if: ($CI_COMMIT_BRANCH && $CI_COMMIT_REF_PROTECTED == 'true')
    
    112 118
     
    
    113 119
     yaml:
    
    114 120
       extends: .base
    
    ... ... @@ -123,7 +129,7 @@ yaml:
    123 129
             - '**/*.yaml'
    
    124 130
             - '**/.ymllint'
    
    125 131
         # Run job whenever a commit is merged to a protected branch
    
    126
    -    - if: $CI_COMMIT_REF_PROTECTED == 'true'
    
    132
    +    - if: ($CI_COMMIT_BRANCH && $CI_COMMIT_REF_PROTECTED == 'true')
    
    127 133
     
    
    128 134
     shellcheck:
    
    129 135
       extends: .base
    
    ... ... @@ -137,7 +143,7 @@ shellcheck:
    137 143
             - '**/*.sh'
    
    138 144
             - 'tools/lint/shellcheck.yml'
    
    139 145
         # Run job whenever a commit is merged to a protected branch
    
    140
    -    - if: $CI_COMMIT_REF_PROTECTED == 'true'
    
    146
    +    - if: ($CI_COMMIT_BRANCH && $CI_COMMIT_REF_PROTECTED == 'true')
    
    141 147
     
    
    142 148
     clang-format:
    
    143 149
       extends: .base
    
    ... ... @@ -157,7 +163,7 @@ clang-format:
    157 163
             - '**/*.mm'
    
    158 164
             - 'tools/lint/clang-format.yml'
    
    159 165
         # Run job whenever a commit is merged to a protected branch
    
    160
    -    - if: $CI_COMMIT_REF_PROTECTED == 'true'
    
    166
    +    - if: ($CI_COMMIT_BRANCH && $CI_COMMIT_REF_PROTECTED == 'true')
    
    161 167
     
    
    162 168
     rustfmt:
    
    163 169
       extends: .base
    
    ... ... @@ -171,7 +177,7 @@ rustfmt:
    171 177
             - '**/*.rs'
    
    172 178
             - 'tools/lint/rustfmt.yml'
    
    173 179
         # Run job whenever a commit is merged to a protected branch
    
    174
    -    - if: $CI_COMMIT_REF_PROTECTED == 'true'
    
    180
    +    - if: ($CI_COMMIT_BRANCH && $CI_COMMIT_REF_PROTECTED == 'true')
    
    175 181
     
    
    176 182
     fluent-lint:
    
    177 183
       extends: .base
    
    ... ... @@ -186,7 +192,7 @@ fluent-lint:
    186 192
             - 'tools/lint/fluent-lint.yml'
    
    187 193
             - 'tools/lint/fluent-lint/exclusions.yml'
    
    188 194
         # Run job whenever a commit is merged to a protected branch
    
    189
    -    - if: $CI_COMMIT_REF_PROTECTED == 'true'
    
    195
    +    - if: ($CI_COMMIT_BRANCH && $CI_COMMIT_REF_PROTECTED == 'true')
    
    190 196
     
    
    191 197
     localization:
    
    192 198
       extends: .base
    
    ... ... @@ -203,7 +209,7 @@ localization:
    203 209
             - 'third_party/python/fluent/**'
    
    204 210
             - 'tools/lint/l10n.yml'
    
    205 211
         # Run job whenever a commit is merged to a protected branch
    
    206
    -    - if: $CI_COMMIT_REF_PROTECTED == 'true'
    
    212
    +    - if: ($CI_COMMIT_BRANCH && $CI_COMMIT_REF_PROTECTED == 'true')
    
    207 213
     
    
    208 214
     mingw-capitalization:
    
    209 215
       extends: .base
    
    ... ... @@ -220,7 +226,7 @@ mingw-capitalization:
    220 226
             - '**/*.h'
    
    221 227
             - 'tools/lint/mingw-capitalization.yml'
    
    222 228
         # Run job whenever a commit is merged to a protected branch
    
    223
    -    - if: $CI_COMMIT_REF_PROTECTED == 'true'
    
    229
    +    - if: ($CI_COMMIT_BRANCH && $CI_COMMIT_REF_PROTECTED == 'true')
    
    224 230
     
    
    225 231
     mscom-init:
    
    226 232
       extends: .base
    
    ... ... @@ -237,7 +243,7 @@ mscom-init:
    237 243
             - '**/*.h'
    
    238 244
             - 'tools/lint/mscom-init.yml'
    
    239 245
         # Run job whenever a commit is merged to a protected branch
    
    240
    -    - if: $CI_COMMIT_REF_PROTECTED == 'true'
    
    246
    +    - if: ($CI_COMMIT_BRANCH && $CI_COMMIT_REF_PROTECTED == 'true')
    
    241 247
     
    
    242 248
     file-whitespace:
    
    243 249
       extends: .base
    
    ... ... @@ -267,7 +273,7 @@ file-whitespace:
    267 273
             - '**/*.java'
    
    268 274
             - 'tools/lint/file-whitespace.yml'
    
    269 275
         # Run job whenever a commit is merged to a protected branch
    
    270
    -    - if: $CI_COMMIT_REF_PROTECTED == 'true'
    
    276
    +    - if: ($CI_COMMIT_BRANCH && $CI_COMMIT_REF_PROTECTED == 'true')
    
    271 277
     
    
    272 278
     test-manifest:
    
    273 279
       extends: .base
    
    ... ... @@ -282,7 +288,7 @@ test-manifest:
    282 288
             - 'python/mozlint/**'
    
    283 289
             - 'tools/lint/**'
    
    284 290
         # Run job whenever a commit is merged to a protected branch
    
    285
    -    - if: $CI_COMMIT_REF_PROTECTED == 'true'
    
    291
    +    - if: ($CI_COMMIT_BRANCH && $CI_COMMIT_REF_PROTECTED == 'true')
    
    286 292
     
    
    287 293
     trojan-source:
    
    288 294
       extends: .base
    
    ... ... @@ -301,4 +307,4 @@ trojan-source:
    301 307
             - '**/*.rs'
    
    302 308
             - 'tools/lint/trojan-source.yml'
    
    303 309
         # Run job whenever a commit is merged to a protected branch
    
    304
    -    - if: $CI_COMMIT_REF_PROTECTED == 'true'
    310
    +    - if: ($CI_COMMIT_BRANCH && $CI_COMMIT_REF_PROTECTED == 'true')