Skip to content

Creating new branches

bbhtt edited this page Oct 21, 2024 · 1 revision

Creating new branches (based on new org.freedesktop.Platform branches)

  1. Follow https://github.com/flathub/org.flatpak.Builder.BaseApp/wiki/Creating-new-branches#creating-new-branches-based-on-new-orgfreedesktopplatform-branches to create a branch for the baseapp and have the new baseapp branch merged and published

  2. Bump runtime-version and base-version to new SDK branch. https://github.com/flathub/org.flatpak.Builder/blob/e3cd681867e9697f334f360f278459f9ecd90640/org.flatpak.Builder.json#L4-L7

  3. Update the wheels in https://github.com/flathub/org.flatpak.Builder/blob/master/flatpak-builder-lint-deps.json to the new Python version

  4. Commit and make a PR

  5. Add a new image for the new SDK to flatpak-github-actions like this https://github.com/flathub-infra/flatpak-github-actions/commit/0fb4f5b529d3e2a7a0b5174390092cf070998e41

  6. Send a PR to https://github.com/flathub-infra/flatpak-builder-lint with the changes:

    6.1 Change https://github.com/flathub-infra/flatpak-builder-lint/blob/03ecc66c93c86eb8913b6e658206b06472c16864/.github/workflows/ci.yml#L82 to the PR branch containing the new runtime update for org.flatpak.Builder

    6.2 Sync flatpak-builder-lint-deps.json from here and docker/flatpak-builder-lint-deps.json in linter repo.

    6.3 Update Dockerfile https://github.com/flathub-infra/flatpak-builder-lint/blob/03ecc66c93c86eb8913b6e658206b06472c16864/docker/Dockerfile#L1 and PYTHONPATH https://github.com/flathub-infra/flatpak-builder-lint/blob/03ecc66c93c86eb8913b6e658206b06472c16864/docker/Dockerfile#L6

  7. Maintainers, make sure linter tests pass with new runtime. Once everything is good:

    7.1 Merge the runtime update PR for org.flatpak.Builder

    7.2 Revert the commit in step 6.1 in linter repo and merge the PR there.

    7.3 Bump linter

    7.4 Fix the branch in step 7 here https://github.com/flathub/org.flatpak.Builder.BaseApp/wiki/Creating-new-branches#creating-new-branches-based-on-new-orgfreedesktopplatform-branches

Clone this wiki locally