Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1e7c4dd authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge branch '3839-master-upstream' into 'master'

Browser: Update to v143.0.7499.52

See merge request !117
parents 0bc17b07 6c383944
Loading
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -3,6 +3,10 @@ workflow:
    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
    - if: $CI_COMMIT_BRANCH == "master"
    - if: $CI_COMMIT_TAG

variables:
  GIT_SUBMODULE_STRATEGY: recursive

stages:
  - build
  - filters
@@ -13,6 +17,9 @@ stages:
    - if: $CI_PIPELINE_SOURCE != "schedule"
  tags:
    - build-browser
  before_script:
    - git submodule update --init --recursive build/cromite
    - $CI_PROJECT_DIR/update_cromite_patches.sh
  artifacts:
    name: "$CI_JOB_NAME"
    paths:

.gitmodules

0 → 100644
+3 −0
Original line number Diff line number Diff line
[submodule "build/cromite"]
	path = build/cromite
	url = https://gitlab.e.foundation/e/os/cromite
+12 −1
Original line number Diff line number Diff line
@@ -110,8 +110,19 @@ patch() {
  echo ">> [$(date)] Applying cromite patches"

  cromite_patches_list=$(cat "${root_dir}/build/cromite_patches_list.txt")
  cromite_patch_dir="${root_dir}/build/cromite/build/patches"
  if [ ! -d "${cromite_patch_dir}" ]; then
    echo "Cromite patches directory not found at ${cromite_patch_dir}."
    echo "Ensure the cromite submodule is initialized (run ./update_cromite_patches.sh)."
    exit 1
  fi
  for file in $cromite_patches_list; do
    git am -C0 -3 --ignore-whitespace "${root_dir}/build/cromite_patches/$file"
    patch_path="${cromite_patch_dir}/$file"
    if [ ! -f "${patch_path}" ]; then
      echo "Patch ${patch_path} missing."
      exit 1
    fi
    git am -C0 -3 --ignore-whitespace "${patch_path}"
  done

  echo ">> [$(date)] Applying /e/ patches"

build/.gitignore

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line
cromite/
Original line number Diff line number Diff line
Subproject commit 73028c53c5508f8fd746958bef4cc911add0c8ac
Loading