Skip to content
Snippets Groups Projects
  1. Jul 28, 2022
  2. Jul 25, 2022
  3. Jul 21, 2022
  4. Jul 07, 2022
  5. Jun 30, 2022
  6. Jun 14, 2022
  7. Jun 02, 2022
  8. Jun 01, 2022
  9. May 30, 2022
  10. May 27, 2022
  11. May 18, 2022
  12. May 16, 2022
  13. Feb 21, 2022
  14. Jan 29, 2022
    • Emanuele Aina's avatar
      pkg-merge-updates: Try to fast-forward before rebasing · f36e681c
      Emanuele Aina authored
      
      Explicitly attempt a fast forward merge before rebasing.
      
      Currently we always try to rebase, which already doews a fast-forward
      merge when possible. The issue is that after that we incoditionally try
      to append a new changelog entry and if we're fast-forwarding we should
      **not** to that since the changelog will already have a version equal or
      newer than the one we're trying to add.
      
      By explicitly attempting a fast-forward merge and exiting early we avoid
      that issue.
      
      This has not been a particular issue so far since the mirroring
      pipeline which uses the rebasing feature does not usually trigger it
      when a fast-forward is possible and will create all the branches in
      their final state.
      
      However in some cases unrelated errors encountered during the process
      have left repositories in a inconsistent state and this change allows to
      recover cleanly from those situations.
      
      Signed-off-by: Emanuele Aina's avatarEmanuele Aina <emanuele.aina@collabora.com>
      f36e681c
  15. Jan 11, 2022
  16. Dec 15, 2021
  17. Oct 19, 2021
  18. Oct 07, 2021
  19. Mar 03, 2021
    • Emanuele Aina's avatar
      ade sysroot: Allow installation of amd64 sysroots · 6490b452
      Emanuele Aina authored
      
      Running `ade sysroot install --release v2021dev3 --arch amd64` results
      in `ade` complaining with:
      
          usage: ade sysroot install [-h] [--verbose] [--distro DISTRO]
                                     [--release RELEASE] [--arch {armhf,arm64}]
                                     [--url URL] [--user USER] [--password PASSWORD]
                                     [--netrc NETRC] [--file FILE] [--force]
          ade sysroot install: error: argument --arch: invalid choice: 'amd64' (choose from 'armhf', 'arm64')
      
      This means that developers attempting to target amd64 targets aren't
      going to be able to follow the ADE documentation and we can't easily
      target different releases using ADE when using an amd64 target, so
      sync the list of allowable values with the main list of the kind of
      sysroots we support.
      
      Signed-off-by: Emanuele Aina's avatarEmanuele Aina <emanuele.aina@collabora.com>
      6490b452
  20. Oct 10, 2019
  21. Aug 02, 2019
  22. Jul 18, 2019
Loading