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

morgan (@morgan) git at gitlab.torproject.org
Thu Aug 15 19:22:36 UTC 2024



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:

- .gitlab/ci/lint.yml
- .gitlab/ci/setup.yml


Changes:

=====================================
.gitlab/ci/lint.yml
=====================================
@@ -61,7 +61,7 @@ eslint:
         - 'tools/lint/eslint/eslint-plugin-mozilla/**'
         - 'tools/lint/eslint/eslint-plugin-spidermonkey-js/**'
     # Run job whenever a commit is merged to a protected branch
-    - if: $CI_COMMIT_REF_PROTECTED == 'true'
+    # - if: $CI_COMMIT_REF_PROTECTED == 'true'
 
 stylelint:
   extends: .base
@@ -79,7 +79,7 @@ stylelint:
         - '**/.stylelintignore'
         - '**/*stylelintrc*'
     # Run job whenever a commit is merged to a protected branch
-    - if: $CI_COMMIT_REF_PROTECTED == 'true'
+    # - if: $CI_COMMIT_REF_PROTECTED == 'true'
 
 py-black:
   extends: .base
@@ -98,7 +98,7 @@ py-black:
         - 'pyproject.toml'
         - 'tools/lint/black.yml'
     # Run job whenever a commit is merged to a protected branch
-    - if: $CI_COMMIT_REF_PROTECTED == 'true'
+    # - if: $CI_COMMIT_REF_PROTECTED == 'true'
 
 py-ruff:
   extends: .base
@@ -117,7 +117,7 @@ py-ruff:
         - 'tools/lint/python/ruff.py'
         - 'tools/lint/python/ruff_requirements.txt'
     # Run job whenever a commit is merged to a protected branch
-    - if: $CI_COMMIT_REF_PROTECTED == 'true'
+    # - if: $CI_COMMIT_REF_PROTECTED == 'true'
 
 yaml:
   extends: .base
@@ -132,7 +132,7 @@ yaml:
         - '**/*.yaml'
         - '**/.ymllint'
     # Run job whenever a commit is merged to a protected branch
-    - if: $CI_COMMIT_REF_PROTECTED == 'true'
+    # - if: $CI_COMMIT_REF_PROTECTED == 'true'
 
 shellcheck:
   extends: .base
@@ -146,7 +146,7 @@ shellcheck:
         - '**/*.sh'
         - 'tools/lint/shellcheck.yml'
     # Run job whenever a commit is merged to a protected branch
-    - if: $CI_COMMIT_REF_PROTECTED == 'true'
+    # - if: $CI_COMMIT_REF_PROTECTED == 'true'
 
 clang-format:
   extends: .base
@@ -166,7 +166,7 @@ clang-format:
         - '**/*.mm'
         - 'tools/lint/clang-format.yml'
     # Run job whenever a commit is merged to a protected branch
-    - if: $CI_COMMIT_REF_PROTECTED == 'true'
+    # - if: $CI_COMMIT_REF_PROTECTED == 'true'
 
 rustfmt:
   extends: .base
@@ -180,7 +180,7 @@ rustfmt:
         - '**/*.rs'
         - 'tools/lint/rustfmt.yml'
     # Run job whenever a commit is merged to a protected branch
-    - if: $CI_COMMIT_REF_PROTECTED == 'true'
+    # - if: $CI_COMMIT_REF_PROTECTED == 'true'
 
 fluent-lint:
   extends: .base
@@ -195,7 +195,7 @@ fluent-lint:
         - 'tools/lint/fluent-lint.yml'
         - 'tools/lint/fluent-lint/exclusions.yml'
     # Run job whenever a commit is merged to a protected branch
-    - if: $CI_COMMIT_REF_PROTECTED == 'true'
+    # - if: $CI_COMMIT_REF_PROTECTED == 'true'
 
 localization:
   extends: .base
@@ -212,7 +212,7 @@ localization:
         - 'third_party/python/fluent/**'
         - 'tools/lint/l10n.yml'
     # Run job whenever a commit is merged to a protected branch
-    - if: $CI_COMMIT_REF_PROTECTED == 'true'
+    # - if: $CI_COMMIT_REF_PROTECTED == 'true'
 
 mingw-capitalization:
   extends: .base
@@ -229,7 +229,7 @@ mingw-capitalization:
         - '**/*.h'
         - 'tools/lint/mingw-capitalization.yml'
     # Run job whenever a commit is merged to a protected branch
-    - if: $CI_COMMIT_REF_PROTECTED == 'true'
+    # - if: $CI_COMMIT_REF_PROTECTED == 'true'
 
 mscom-init:
   extends: .base
@@ -246,7 +246,7 @@ mscom-init:
         - '**/*.h'
         - 'tools/lint/mscom-init.yml'
     # Run job whenever a commit is merged to a protected branch
-    - if: $CI_COMMIT_REF_PROTECTED == 'true'
+    # - if: $CI_COMMIT_REF_PROTECTED == 'true'
 
 file-whitespace:
   extends: .base
@@ -275,7 +275,7 @@ file-whitespace:
         - '**/*.xhtml'
         - 'tools/lint/file-whitespace.yml'
     # Run job whenever a commit is merged to a protected branch
-    - if: $CI_COMMIT_REF_PROTECTED == 'true'
+    # - if: $CI_COMMIT_REF_PROTECTED == 'true'
 
 test-manifest:
   extends: .base
@@ -290,7 +290,7 @@ test-manifest:
         - 'python/mozlint/**'
         - 'tools/lint/**'
     # Run job whenever a commit is merged to a protected branch
-    - if: $CI_COMMIT_REF_PROTECTED == 'true'
+    # - if: $CI_COMMIT_REF_PROTECTED == 'true'
 
 trojan-source:
   extends: .base
@@ -309,4 +309,4 @@ trojan-source:
         - '**/*.rs'
         - 'tools/lint/trojan-source.yml'
     # Run job whenever a commit is merged to a protected branch
-    - if: $CI_COMMIT_REF_PROTECTED == 'true'
+    # - if: $CI_COMMIT_REF_PROTECTED == 'true'


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



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/668cc010edc95521b4fa20aa5cc8ebc287d6776c...9781ac5125d63f67082a1cafa3ff98536fb8fb5a

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/668cc010edc95521b4fa20aa5cc8ebc287d6776c...9781ac5125d63f67082a1cafa3ff98536fb8fb5a
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20240815/2c5d7137/attachment-0001.htm>


More information about the tor-commits mailing list