Unverified Commit 79e9cf8e authored by Leona Maroni's avatar Leona Maroni Committed by GitHub
Browse files

gitlab: update prometheus-client-mmap gem to fix aarch64 (#369636)

parents bfc62ac3 d2b0b70d

nixos/release-combined.nix

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ rec { 


        (onFullSupported "nixos.tests.firewall")

        (onFullSupported "nixos.tests.fontconfig-default-fonts")

        (onSystems [ "x86_64-linux" ] "nixos.tests.gitlab") # we lack energy to really debug aarch64 here

        (onFullSupported "nixos.tests.gitlab")

        (onFullSupported "nixos.tests.gnome")

        (onFullSupported "nixos.tests.gnome-xorg")

        (onSystems [ "x86_64-linux" ] "nixos.tests.hibernate")

pkgs/applications/version-management/gitlab/rubyEnv/Gemfile

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ gem 'snowplow-tracker', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory 


# Metrics

gem 'webrick', '~> 1.8.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory

gem 'prometheus-client-mmap', '~> 1.1', '>= 1.1.1', require: 'prometheus/client' # rubocop:todo Gemfile/MissingFeatureCategory

gem 'prometheus-client-mmap', '1.1.2', require: 'prometheus/client' # rubocop:todo Gemfile/MissingFeatureCategory



# Event-driven reactor for Ruby

# Required manually in config/initializers/require_async_gem

pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock

+4 −3
Original line number Diff line number Diff line
@@ -1436,7 +1436,8 @@ GEM 
      coderay

      parser

      unparser

    prometheus-client-mmap (1.1.1)

    prometheus-client-mmap (1.1.2)

      base64

      rb_sys (~> 0.9.86)

    pry (0.14.2)

      coderay (~> 1.1)
@@ -2226,7 +2227,7 @@ DEPENDENCIES 
  pg_query (~> 5.1.0)

  png_quantizator (~> 0.2.1)

  premailer-rails (~> 1.12.0)

  prometheus-client-mmap (~> 1.1, >= 1.1.1)

  prometheus-client-mmap (= 1.1.2)

  pry-byebug

  pry-rails (~> 0.3.9)

  pry-shell (~> 0.6.4)
@@ -2329,4 +2330,4 @@ DEPENDENCIES 
  yajl-ruby (~> 1.4.3)



BUNDLED WITH

   2.5.11
 
   2.5.22

pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix

+3 −3
Original line number Diff line number Diff line
@@ -5063,15 +5063,15 @@ src: 
    version = "0.1.0";

  };

  prometheus-client-mmap = {

    dependencies = ["rb_sys"];

    dependencies = ["base64" "rb_sys"];

    groups = ["default"];

    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "0vg47xx3wgg24snqc6ychb08mbcyrjmvxym9fg69cpa4xvj133fx";

      sha256 = "1dwvpxqj652c8r61q88s336vzf2h2akcijk9hmjp9jzlnhil44n4";

      type = "gem";

    };

    version = "1.1.1";

    version = "1.1.2";

  };

  pry = {

    dependencies = ["coderay" "method_source"];

pkgs/applications/version-management/gitlab/update.py

+6 −0
Original line number Diff line number Diff line
@@ -180,6 +180,12 @@ def update_rubyenv(): 
        cwd=rubyenv_dir,

    )



    # update to 1.1.2 to fix https://gitlab.com/gitlab-org/ruby/gems/prometheus-client-mmap/-/issues/68

    subprocess.check_output(

        ["sed", "-i", "s:'prometheus-client-mmap', '~> 1.1', '>= 1.1.1':'prometheus-client-mmap', '1.1.2':g", "Gemfile"],

        cwd=rubyenv_dir,

    )



    # Un-vendor sidekiq

    #

    # The sidekiq dependency was vendored to maintain compatibility with Redis 6.0 (as