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

Commit 93163bbc authored by Alexandre Roux's avatar Alexandre Roux
Browse files

Merge branch 'master-regenerate-manifest' into 'master' 

use REGENERATE_MANIFEST instead of BETA

See merge request e/os/releases!217
parents f76508b8 dd8be6bd

create_new_tag.sh

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ fi 






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

if [ "$REGENERATE_MANIFEST" = "true" ]

then

    git clone $REPO current_project -b $CI_COMMIT_REF_NAME 

    cd current_project
@@ -133,7 +133,7 @@ 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" ]

if [ "$REGENERATE_MANIFEST" != "true" ]

then

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

    git checkout default.xml