Skip to content

scripts: introduce update-manifest script#38

Closed
mike-scott wants to merge 1 commit intofoundriesio:masterfrom
mike-scott:fio-add-update-script
Closed

scripts: introduce update-manifest script#38
mike-scott wants to merge 1 commit intofoundriesio:masterfrom
mike-scott:fio-add-update-script

Conversation

@mike-scott
Copy link
Copy Markdown
Contributor

Introduce a script to make updating to new LmP releases easier.

Usage:
scripts/update-manifest [tag]

If a tag is not supplied, then the latest tag in the lmp-manifest
will be used for the merge target.

Signed-off-by: Michael Scott [email protected]

Introduce a script to make updating to new LmP releases easier.

Usage:
scripts/update-manifest [tag]

If a tag is not supplied, then the latest tag in the lmp-manifest
will be used for the merge target.

Signed-off-by: Michael Scott <[email protected]>
@EmbeddedAndroid
Copy link
Copy Markdown
Contributor

Tested this locally, where my manifest was update to date and another case where I was a few release behind. Seems to work fine on my end.

Updated docs to reflect this change can be found here: https://ci.foundries.io/projects/fio-docs/builds/330/docs/artifacts/html/customer-factory/updating-the-core.html

@mike-scott
Copy link
Copy Markdown
Contributor Author

These are the following cases the script handles:

  • Tag supplied: tries to use it as upstream reference -- if invalid aborts
  • Tag not supplied: uses the latest upstream tag instead
  • Attempts to perform a merge to the tag, if it ends with a conflict it git merge --abort to leave the user's manifest in a usable state (doesn't reset any files -- I checked) -- errors out.
  • if merge is successful, examines the git for an upstream tracking branch: if none and branch is "default" assumes it's a repo checkout and uses "refs/heads/master"
  • if no tracking branch and not "default" then it aborts with error message.

^^ This is a case where it doesn't end all that well. The user now has an upgraded manifest that isn't pushed and if this was a repo their local builds would be different than what's on the server.

@mike-scott mike-scott closed this Oct 18, 2019
@mike-scott
Copy link
Copy Markdown
Contributor Author

Moving this to devel branch

@mike-scott mike-scott deleted the fio-add-update-script branch January 15, 2020 21:02
ricardosalveti added a commit to ricardosalveti/lmp-manifest that referenced this pull request Jun 7, 2022
Relevant changes:
- 6f3016d Merge pull request foundriesio#40 from ricardosalveti/ostree
- 4c3f2e8 image_types_ota.bbclass: add support for none as OSTREE_BOOTLOADER
- c2b18de Merge pull request foundriesio#39 from shr-project/jansa/gcc-12
- c103d77 aktualizr: bump SRCREV
- 945d0dc Merge pull request foundriesio#38 from shr-project/jansa/gcc-11
- e64e1b0 aktualizr: bump SRCREV
- e9aab7f Merge pull request foundriesio#36 from ricardosalveti/nfsutils
- bfcf400 nfs-utils: prefer tmpfiles instead of a custom service

Signed-off-by: Ricardo Salveti <[email protected]>
ricardosalveti added a commit that referenced this pull request Jun 10, 2022
Relevant changes:
- 6f3016d Merge pull request #40 from ricardosalveti/ostree
- 4c3f2e8 image_types_ota.bbclass: add support for none as OSTREE_BOOTLOADER
- c2b18de Merge pull request #39 from shr-project/jansa/gcc-12
- c103d77 aktualizr: bump SRCREV
- 945d0dc Merge pull request #38 from shr-project/jansa/gcc-11
- e64e1b0 aktualizr: bump SRCREV
- e9aab7f Merge pull request #36 from ricardosalveti/nfsutils
- bfcf400 nfs-utils: prefer tmpfiles instead of a custom service

Signed-off-by: Ricardo Salveti <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants