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

Commit ae624026 authored by Alexandre Roux's avatar Alexandre Roux
Browse files

Merge branch 'master-fix-main-not-updated' into 'master'

also update main and master branches in manifest

See merge request e/os/releases!223
parents bce4899d f3a90bc8
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -78,8 +78,10 @@ if [ "$REGENERATE_MANIFEST" = "true" ]
then
    git clone $REPO current_project -b $CI_COMMIT_REF_NAME 
    cd current_project
    find . -type f -name "*.xml" -exec sed -i '/remote="e"/s/revision="main"/revision="'$new_version_without_android'"/' {} +
    find . -type f -name "*.xml" -exec sed -i '/remote="e"/s/revision="master"/revision="'$new_version_without_android'"/' {} +
    sed -i 's/'$CI_COMMIT_REF_NAME'/'$new_version'/' default.xml
    git add default.xml
    git add \*.xml
    git commit -m "creating "$new_version" manifest"
    echo "creating branch "$new_version" on main manifest"
    create_branch $new_version origin