[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser][base-browser-128.1.0esr-14.0-1] 2 commits: fixup! Add CI for Base Browser

Title: GitLab

morgan pushed to branch base-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser

Commits:

  • 28c9e96f
    by Beatriz Rizental at 2024-08-15T19:21:34+00:00 
    fixup! Add CI for Base Browser

Fix issue that prevents the create-bundle job from succeeding when there
is already a branch with the same name as the one being pushed to in the
CI -- mostly happens on protected branches.
  • 9781ac51
    by Beatriz Rizental at 2024-08-15T19:21:42+00:00 
    Temporary commit: Disable CI in protected branches

This is temporary until we find a proper fix for the slowness caused by
our CI in Gitlba.

2 changed files:

Changes:

  • .gitlab/ci/lint.yml
    ... ... @@ -61,7 +61,7 @@ eslint:
    61 61 
             - 'tools/lint/eslint/eslint-plugin-mozilla/**'
    62 62 
             - 'tools/lint/eslint/eslint-plugin-spidermonkey-js/**'
    63 63 
         # Run job whenever a commit is merged to a protected branch
    64 
    -    - if: $CI_COMMIT_REF_PROTECTED == 'true'
    64 
    +    # - if: $CI_COMMIT_REF_PROTECTED == 'true'
    65 65
    66 66 
     stylelint:
    67 67 
       extends: .base
    ... ... @@ -79,7 +79,7 @@ stylelint:
    79 79 
             - '**/.stylelintignore'
    80 80 
             - '**/*stylelintrc*'
    81 81 
         # Run job whenever a commit is merged to a protected branch
    82 
    -    - if: $CI_COMMIT_REF_PROTECTED == 'true'
    82 
    +    # - if: $CI_COMMIT_REF_PROTECTED == 'true'
    83 83
    84 84 
     py-black:
    85 85 
       extends: .base
    ... ... @@ -98,7 +98,7 @@ py-black:
    98 98 
             - 'pyproject.toml'
    99 99 
             - 'tools/lint/black.yml'
    100 100 
         # Run job whenever a commit is merged to a protected branch
    101 
    -    - if: $CI_COMMIT_REF_PROTECTED == 'true'
    101 
    +    # - if: $CI_COMMIT_REF_PROTECTED == 'true'
    102 102
    103 103 
     py-ruff:
    104 104 
       extends: .base
    ... ... @@ -117,7 +117,7 @@ py-ruff:
    117 117 
             - 'tools/lint/python/ruff.py'
    118 118 
             - 'tools/lint/python/ruff_requirements.txt'
    119 119 
         # Run job whenever a commit is merged to a protected branch
    120 
    -    - if: $CI_COMMIT_REF_PROTECTED == 'true'
    120 
    +    # - if: $CI_COMMIT_REF_PROTECTED == 'true'
    121 121
    122 122 
     yaml:
    123 123 
       extends: .base
    ... ... @@ -132,7 +132,7 @@ yaml:
    132 132 
             - '**/*.yaml'
    133 133 
             - '**/.ymllint'
    134 134 
         # Run job whenever a commit is merged to a protected branch
    135 
    -    - if: $CI_COMMIT_REF_PROTECTED == 'true'
    135 
    +    # - if: $CI_COMMIT_REF_PROTECTED == 'true'
    136 136
    137 137 
     shellcheck:
    138 138 
       extends: .base
    ... ... @@ -146,7 +146,7 @@ shellcheck:
    146 146 
             - '**/*.sh'
    147 147 
             - 'tools/lint/shellcheck.yml'
    148 148 
         # Run job whenever a commit is merged to a protected branch
    149 
    -    - if: $CI_COMMIT_REF_PROTECTED == 'true'
    149 
    +    # - if: $CI_COMMIT_REF_PROTECTED == 'true'
    150 150
    151 151 
     clang-format:
    152 152 
       extends: .base
    ... ... @@ -166,7 +166,7 @@ clang-format:
    166 166 
             - '**/*.mm'
    167 167 
             - 'tools/lint/clang-format.yml'
    168 168 
         # Run job whenever a commit is merged to a protected branch
    169 
    -    - if: $CI_COMMIT_REF_PROTECTED == 'true'
    169 
    +    # - if: $CI_COMMIT_REF_PROTECTED == 'true'
    170 170
    171 171 
     rustfmt:
    172 172 
       extends: .base
    ... ... @@ -180,7 +180,7 @@ rustfmt:
    180 180 
             - '**/*.rs'
    181 181 
             - 'tools/lint/rustfmt.yml'
    182 182 
         # Run job whenever a commit is merged to a protected branch
    183 
    -    - if: $CI_COMMIT_REF_PROTECTED == 'true'
    183 
    +    # - if: $CI_COMMIT_REF_PROTECTED == 'true'
    184 184
    185 185 
     fluent-lint:
    186 186 
       extends: .base
    ... ... @@ -195,7 +195,7 @@ fluent-lint:
    195 195 
             - 'tools/lint/fluent-lint.yml'
    196 196 
             - 'tools/lint/fluent-lint/exclusions.yml'
    197 197 
         # Run job whenever a commit is merged to a protected branch
    198 
    -    - if: $CI_COMMIT_REF_PROTECTED == 'true'
    198 
    +    # - if: $CI_COMMIT_REF_PROTECTED == 'true'
    199 199
    200 200 
     localization:
    201 201 
       extends: .base
    ... ... @@ -212,7 +212,7 @@ localization:
    212 212 
             - 'third_party/python/fluent/**'
    213 213 
             - 'tools/lint/l10n.yml'
    214 214 
         # Run job whenever a commit is merged to a protected branch
    215 
    -    - if: $CI_COMMIT_REF_PROTECTED == 'true'
    215 
    +    # - if: $CI_COMMIT_REF_PROTECTED == 'true'
    216 216
    217 217 
     mingw-capitalization:
    218 218 
       extends: .base
    ... ... @@ -229,7 +229,7 @@ mingw-capitalization:
    229 229 
             - '**/*.h'
    230 230 
             - 'tools/lint/mingw-capitalization.yml'
    231 231 
         # Run job whenever a commit is merged to a protected branch
    232 
    -    - if: $CI_COMMIT_REF_PROTECTED == 'true'
    232 
    +    # - if: $CI_COMMIT_REF_PROTECTED == 'true'
    233 233
    234 234 
     mscom-init:
    235 235 
       extends: .base
    ... ... @@ -246,7 +246,7 @@ mscom-init:
    246 246 
             - '**/*.h'
    247 247 
             - 'tools/lint/mscom-init.yml'
    248 248 
         # Run job whenever a commit is merged to a protected branch
    249 
    -    - if: $CI_COMMIT_REF_PROTECTED == 'true'
    249 
    +    # - if: $CI_COMMIT_REF_PROTECTED == 'true'
    250 250
    251 251 
     file-whitespace:
    252 252 
       extends: .base
    ... ... @@ -275,7 +275,7 @@ file-whitespace:
    275 275 
             - '**/*.xhtml'
    276 276 
             - 'tools/lint/file-whitespace.yml'
    277 277 
         # Run job whenever a commit is merged to a protected branch
    278 
    -    - if: $CI_COMMIT_REF_PROTECTED == 'true'
    278 
    +    # - if: $CI_COMMIT_REF_PROTECTED == 'true'
    279 279
    280 280 
     test-manifest:
    281 281 
       extends: .base
    ... ... @@ -290,7 +290,7 @@ test-manifest:
    290 290 
             - 'python/mozlint/**'
    291 291 
             - 'tools/lint/**'
    292 292 
         # Run job whenever a commit is merged to a protected branch
    293 
    -    - if: $CI_COMMIT_REF_PROTECTED == 'true'
    293 
    +    # - if: $CI_COMMIT_REF_PROTECTED == 'true'
    294 294
    295 295 
     trojan-source:
    296 296 
       extends: .base
    ... ... @@ -309,4 +309,4 @@ trojan-source:
    309 309 
             - '**/*.rs'
    310 310 
             - 'tools/lint/trojan-source.yml'
    311 311 
         # Run job whenever a commit is merged to a protected branch
    312 
    -    - if: $CI_COMMIT_REF_PROTECTED == 'true'
    312 
    +    # - if: $CI_COMMIT_REF_PROTECTED == 'true'

  • .gitlab/ci/setup.yml
    ... ... @@ -32,11 +32,14 @@ create-bundle:
    32 32 
       script:
    33 33 
         # DEBUG: Check repository status.
    34 34 
         - git status
    35 
    -    # Switch to a named branch.
    36 
    -    - git switch -c $BRANCH_NAME
    35 
    +    # DEBUG: Check branches in repository
    36 
    +    - git branch
    37 
    +    # Force switch to a named branch. We force it in case there is already
    38 
    +    # a branch with the same name from previous runs.
    39 
    +    - git switch -C $BRANCH_NAME
    37 40 
         # Create a git bundle -- this will generate the app.bundle file,
    38 41 
         # which can be used as a git remote for offline fetching.
    39 
    -    - git bundle create app.bundle --all
    42 
    +    - git bundle create app.bundle $BRANCH_NAME
    40 43 
         # Retain the SHA of the base of this shallow repository.
    41 44 
         - cat .git/shallow > shallow.txt
    42 45 
         # DEBUG: Check sizes.

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits