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

Commit bfee0dc8 authored by Jackeagle's avatar Jackeagle
Browse files

Fix repo manifest command to run from correct directory

repo manifest must be executed from the synced repo directory, not the releases project directory.
parent f20870f4
Loading
Loading
Loading
Loading
+8 −6
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ REPO="git@gitlab.e.foundation:e/os/android.git"


# Install xmlstarlet if not available
apt install -y xmlstarlet
which xmlstarlet || (apt-get update && apt-get install -y xmlstarlet)

create_branch (){
    git checkout -b $1
@@ -145,18 +145,18 @@ else
    fi
fi

cd $CI_PROJECT_DIR

if [ "$REGENERATE_MANIFEST" != "true" ]
then
    echo "REGENERATE_MANIFEST=false: Creating selective manifest (only updating e/e-priv repos)"
    
    # Generate full manifest from repo sync (run from synced repo directory)
    cd "$SRC_DIR/$CI_COMMIT_REF_NAME"
    repo manifest -r -o $CI_PROJECT_DIR/full_manifest.xml
    
    cd $CI_PROJECT_DIR
    # Save current manifest as backup
    cp default.xml current_manifest_backup.xml
    
    # Generate full manifest from repo sync
    repo manifest -r -o full_manifest.xml
    
    # Create selective manifest by merging:
    # - e/e-priv repos from full manifest (updated revisions)
    # - all other repos from current manifest (preserve existing revisions)
@@ -185,7 +185,9 @@ then
else
    echo "REGENERATE_MANIFEST=true: Using full manifest (updating all repos)"
    # Generate full manifest from repo sync (original behavior)
    cd "$SRC_DIR/$CI_COMMIT_REF_NAME"
    repo manifest -r -o $CI_PROJECT_DIR/default.xml
    cd $CI_PROJECT_DIR
fi
git add .
git commit -m "Update $CI_COMMIT_REF_NAME manifest" || true