Skip to content
Snippets Groups Projects
  1. Oct 14, 2023
    • Georges Racinet's avatar
      Merged and adapted upstream 16.1 CE branching point · 0f15def156c6
      Georges Racinet authored
      also matching `BUILDER_IMAGE_REVISION` and `BUNDLER_VERSION`
      
      In d14fa645b774, upstream makes the underscore the norm in configuration
      nodes (whereas service names keep their hyphens). This breaks access for
      `hg-inner-http` such as done in the enabling loop of
      `files/gitlab-cookbooks/gitlab/recipes/default.rb`, so we had to correct
      by using the `hg_inner_http` key.
      
      There were conflicts in `lib/gitlab/build/info.rb`, with upstream
      implementing more changes to what `latest_tag` really means, on
      stable branches (excluding rc releases), when tags don't exist yet
      etc. These are all irrelevant to our builds, but we may want to
      check what they are doing for inspiration later on.
      0f15def156c6
  2. Sep 28, 2023
  3. Sep 26, 2023
    • Georges Racinet's avatar
      Merged upstream 16.0 branching point · a9d2c8f2a98d
      Georges Racinet authored
      The branching point is actually the grand-parent of 16.0.0+rc42.ce.0
      (strangely, `~2` revset notation does not work for me in this case).
      
      This bumps the base distribution for the Docker image to Ubuntu 22.04,
      which we already know to be problematic with Kaniko and Podman (but not
      wich Docker) because of some bad interplay between RUnit and what
      the base system expects.
      
      There are hints that it could also work with 20.04 (AWS AMI images),
      but perhaps we'll be better solving this particular problem now, hopefully for good.
      a9d2c8f2a98d
  4. Sep 21, 2023
  5. Sep 18, 2023
    • Georges Racinet's avatar
      Merged upstream up to the bump of rubygems version. · 1c921ad420e5
      Georges Racinet authored
      As explained in 5d0a2f595e20, this can be needed, and indeed
      we are experiencing breakage in the latest triggered Omnibus
      pipeline (at roughly a 1/3rd distance between GitLab 15.11 and 16.0):
      
        prometheus-client-mmap-0.21.0-x86_64-linux-musl requires rubygems version >=
        3.3.22, which is incompatible with the current version, 3.2.33
        /builds/heptapod/omnibus-heptapod/.bundle/ruby/3.0.0/bundler/gems/omnibus-0451fe396704/lib/omnibus/util.rb:139:in `rescue in shellout!'
        ...
      1c921ad420e5
  6. Sep 20, 2023
  7. Aug 11, 2023
    • Georges Racinet's avatar
      Merged upstream at the point where the `embedded` database appears · 01baf50c6902
      Georges Racinet authored
      Was raised by build on the latest Rails upstream merge: there is this new
      (AI related) DB, and Omnibus has to accept it.
      
      Had to adapt the new tests for `Build::Info.latest_stable_tag` and
      `.previous_version`, which led to actual implementation (not
      really guaranteed to work, especially `previous_version` aka level 2,
      since there is so much stubbing).
      As in be9b037d0df9, we don't use them, but they might prove useful later.
      01baf50c6902
  8. Aug 09, 2023
  9. Aug 08, 2023
  10. Aug 07, 2023
  11. Aug 06, 2023
  12. Jul 30, 2023
  13. Jul 26, 2023
  14. Jul 23, 2023
    • Georges Racinet's avatar
      Merged upstream 15.11.0+rc42+ce.0 into heptapod branch · d87d9498ded7
      Georges Racinet authored
      No conflict except in version files, but had to stub
      `Build::Info::package` for some new RSpec tests to pass.
      
      This is the first build for the future Heptapod 0.38, hence we're
      bumping the cache key.
      
      New upstream builder image version copied over to `heptapod-ci.yml`
      d87d9498ded7
  15. Jul 20, 2023
  16. Jul 19, 2023
  17. Jul 17, 2023
  18. Jul 15, 2023
  19. Jul 14, 2023
  20. Jul 04, 2023
  21. Jul 12, 2023
    • Georges Racinet's avatar
      Merged upstream 15.9.0+ce.0 into heptapod branch · 78caa877f9bb
      Georges Racinet authored
      Notable changes:
      
      - lib: `gitlab_rails_commit` renamed to `gitlab_rails_commit_ref`, with a
        minor API change (use of kwarg, that is now facilitated by Ruby 3.0). As
        far as the rest of the logic goes, we are still not using their
        "build facts", we have our own independent system.
      - python3: bump to 3.9.16 and more options related to built openssl (but
        we are using the system one inconditionally).
      - recipes: upstream stopped activating GitLab Shell automatically if GitLab
        Rails is, and that is something we cannot do. We were also activating
        Mercurial in that case, and of course still are.
      - CI: base image version bumped from 4.1.0 to 4.6.0
      78caa877f9bb
    • Georges Racinet's avatar
      Merged heptapod-stable branch into heptapod · b358ecd0e9fb
      Georges Racinet authored
      b358ecd0e9fb
  22. Jun 17, 2023
Loading