Skip to content

Updatating the sources

Rasbats edited this page Sep 22, 2021 · 3 revisions

This is about updating the sources. First, make sure you have an updated main branch:

$ git remote update origin

$ git rebase origin/main

There might be conflicts. If so, avoid using "your" stuff when resolving. Then, update the sources:

$ ./source-state.sh update

$ antora site.yml

This gives an updated, local build. To push this and make a new build:

$ git add sources.state

$ git commit -m "Update sources to latest versions"

$ git push -f origin main:build

If everything looks sane, push also to main:

$ git remote update origin

$ git rebase origin/main

$ git push origin main:main

EDIT: DON'T USE -f WHEN PUSHING TO MAIN!

When things goes bad: Reset the sources directory completely:

$ rm -rf sources/*

$ git checkout sources/.gitkeep

$ ./source-state.sh restore

Clone this wiki locally