-
Notifications
You must be signed in to change notification settings - Fork 198
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[DRAFT] add REPO_SYNC to disable repo sync #432
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Documenting that option in the readme would be good.
Some local changes will still be lost, this might also be relevant for the documentation. See
docker-lineage-cicd/src/build.sh
Lines 159 to 168 in 5c35c2e
# Remove previous changes of vendor/cm, vendor/lineage and frameworks/base (if they exist) | |
# TODO: maybe reset everything using https://source.android.com/setup/develop/repo#forall | |
for path in "vendor/cm" "vendor/lineage" "frameworks/base" "packages/apps/PermissionController" "packages/modules/Permission"; do | |
if [ -d "$path" ]; then | |
cd "$path" | |
git reset -q --hard | |
git clean -q -fd | |
cd "$SRC_DIR/$branch_dir" | |
fi | |
done |
Dockerfile
Outdated
@@ -149,6 +152,7 @@ RUN apt-get -qq update && \ | |||
libxml2-utils lsof lzop maven openjdk-8-jdk pngcrush procps python3 \ | |||
python-is-python3 rsync schedtool squashfs-tools wget xdelta3 xsltproc yasm zip \ | |||
zlib1g-dev \ | |||
python2 gcc-9 \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems unrelated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems unrelated
I'm sorry, removed.
Some local changes will still be lost
Yes, but changes will be applied again, for example:
docker-lineage-cicd/src/build.sh
Lines 198 to 200 in 5c35c2e
# Set up our overlay | |
mkdir -p "vendor/$vendor/overlay/microg/" | |
sed -i "1s;^;PRODUCT_PACKAGE_OVERLAYS := vendor/$vendor/overlay/microg\n;" "vendor/$vendor/config/common.mk" |
It will be:
PRODUCT_PACKAGE_OVERLAYS := vendor/$vendor/overlay/microg
PRODUCT_PACKAGE_OVERLAYS := vendor/$vendor/overlay/microg
PRODUCT_PACKAGE_OVERLAYS := vendor/$vendor/overlay/microg
...
And I think this will be confused with the name REPO_SYNC
, maybe we need another setting name? Any idea?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it would be clearer if we call the flag SKIP-REPO_SYNC
, and invert the logic of the code in build.sh
(and change the docs to match)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it would be clearer if we call the flag
SKIP-REPO_SYNC
, and invert the logic of the code inbuild.sh
(and change the docs to match)
That's a better way but will cause much changes in build.sh
.
And should we really define the overlay setting and patches applying as parts of REPO SYNC
?
Maybe another setting name about read-only
is better, which means this will only try to build and never modify any source code you've synced or modified before
:)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good questions. Too many open questions for this to get merged for Friday's build run. I'll set the PR back to Draft, and we can give it some more tghought in the next couple of weeks
Assigned back to @hellodword for requested changes Converted to 'Drafy' |
Too many outstanding issues for this to be merged yet:
|
related pr #160 but less changes