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

Commit 354e8cec authored by Alexandre Roux's avatar Alexandre Roux
Browse files

Merge branch 'master-7834-apply-only-changes-on-eos-projects' into 'master' 

when not on beta 1, apply changes only on eOS projects

See merge request e/os/releases!207
parents 853b19ca 7080d996

create_new_tag.sh

+8 −0
Original line number Diff line number Diff line
@@ -132,6 +132,14 @@ fi 


repo manifest -r -o $CI_PROJECT_DIR/default.xml

cd $CI_PROJECT_DIR

# if not beta, apply only changes on eOS projects

if [ "$PREVERSION" != "beta" ]

then

    git diff --ignore-matching-lines ".*LineageOS.*" --ignore-matching-lines ".*aosp.*" > file.patch

    git checkout default.xml

    git apply file.patch

    rm file.patch

fi

git add .

git commit -m "Update $CI_COMMIT_REF_NAME manifest" || true

git push origin HEAD:$CI_COMMIT_REF_NAME