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

Commit 8b8b6ba8 authored by Alexandre Roux's avatar Alexandre Roux
Browse files

for now don't keep branch on local and vendors manifest

parent a6ed5c66

create_new_tag.sh

+3 −4
Original line number Diff line number Diff line
@@ -34,11 +34,10 @@ parse_manifests () { 
    done

}



parse_and_update_project_manifest () {

clone_and_parse_project_manifest () {

    git clone $1 -b $CI_COMMIT_REF_NAME manifests

    cd manifests

    parse_manifests

    create_branch $new_version origin

    cd ..

    rm -rf manifests

}
@@ -118,9 +117,9 @@ then 
    mkdir working-dir

    cd working-dir

    echo ">> Get custom local manifests"

    parse_and_update_project_manifest git@gitlab.e.foundation:e/os/local_manifests.git

    clone_and_parse_project_manifest git@gitlab.e.foundation:e/os/local_manifests.git

    echo ">> Get custom vendor manifests"

    parse_and_update_project_manifest git@gitlab.e.foundation:e/devices/manifests.git 

    clone_and_parse_project_manifest git@gitlab.e.foundation:e/devices/manifests.git 

    cd ..

templates/.gitlab-ci.yml

+0 −1
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ stages: 
    TAG_NAME: ${CI_COMMIT_TAG}

    PUBLISH_STAGING_AUTOMATICALLY: "true"

    USER_BUILD: "false"

    KEEP_LOCAL_MANIFEST_BRANCH: "true"

  trigger:

    project: "e/priv/os/build"

    branch: ${BUILD_BRANCH}