gitlab: 18.7.2 -> 18.8.3
https://about.gitlab.com/releases/2026/01/15/gitlab-18-8-released/ https://about.gitlab.com/releases/2026/02/04/gitlab-18-8-3-released/ This update breaks the normal update.py flow partially. The frontend_islands hash doesn't update automatically, and as this seems to be fixed in GitLab master, I don't care to fix the update script for that short period. Gitaly's git build doesn't use tagged versions anymore, but commits. This lead to a change in the update script that finds out what the last major version is. Because nix-update can't be used (version has no relation with src.rev), the update script was extended with a manual updater.
This commit is contained in:
Leona Maroni
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"version": "2.52-a37bb2ae",
|
||||
"rev": "a37bb2ae6c6659cf7cefd0412759fca5202a823d",
|
||||
"hash": "sha256-7yUjXiaFwPG9o4n+IieYNTJKtzyawQFHooNrikpbiEM="
|
||||
}
|
||||
@@ -10,24 +10,19 @@
|
||||
pkg-config,
|
||||
openssl,
|
||||
}:
|
||||
|
||||
let
|
||||
data = lib.importJSON ./git-data.json;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
inherit (data) version;
|
||||
pname = "gitaly-git";
|
||||
version = "2.50.1.gl1";
|
||||
|
||||
# `src` attribute for nix-update
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "git";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-q+xQAVsatw0vS4iIgAxciAVVMr33BjG0yM4AvZrXB+8=";
|
||||
inherit (data) rev hash;
|
||||
leaveDotGit = true;
|
||||
# The build system clones the repo from the store (since it always expects
|
||||
# to be able to clone in the makefiles) and it looks like nix doesn't leave
|
||||
# the tag so we re-add it.
|
||||
postFetch = ''
|
||||
git -C $out tag v${version};
|
||||
'';
|
||||
};
|
||||
|
||||
# Use gitaly and their build system as source root
|
||||
@@ -39,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
sourceRoot = src.name;
|
||||
|
||||
buildFlags = [ "git" ];
|
||||
buildFlags = [ "install-git" ];
|
||||
GIT_REPO_URL = src;
|
||||
HOME = "/build";
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "18.7.2";
|
||||
version = "18.8.3";
|
||||
package_version = "v${lib.versions.major version}";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
|
||||
|
||||
@@ -21,7 +21,7 @@ let
|
||||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ELnkYWIblDmlZHzfr8qBo7/HzZIn9gYNPy1MqkopCc4=";
|
||||
hash = "sha256-ALUOgSPl+tNh/hmnYq2Mfw7R0ECQ/ohUZZNnBeItQds=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-CSjsxwumKUbp/tSewE8iAp4c3DH6V6fNY4OCgzjvHP0=";
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
buildGo124Module rec {
|
||||
pname = "gitlab-container-registry";
|
||||
version = "4.35.0";
|
||||
version = "4.36.0";
|
||||
rev = "v${version}-gitlab";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
@@ -14,10 +14,10 @@ buildGo124Module rec {
|
||||
owner = "gitlab-org";
|
||||
repo = "container-registry";
|
||||
inherit rev;
|
||||
hash = "sha256-IVV5nmkH8tll7S8ffO+GE/SiYm9/AtbtridebDVwCNM=";
|
||||
hash = "sha256-Zp6zwSdgtDDKUDoF7EBLkcKZG5e68wI6x3QG8pwaDfM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-CvlZXGt6pSfGA2ZUPkysasKDiFHgwF2LRoYR7xxHihw=";
|
||||
vendorHash = "sha256-DWuMsTOw/yjEfh7e8FLT4qhNU3TLOFlI6dcNx+OQuEs=";
|
||||
|
||||
checkFlags =
|
||||
let
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "gitlab-code-parser";
|
||||
version = "0.21.0";
|
||||
version = "0.21.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "rust/gitlab-code-parser";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-eiK6FlIQjSwXsANrMhTm99uzv5kiR1bzH5eHy0myGX0=";
|
||||
hash = "sha256-aA1zwauomznayHVGRdoQYaaba8Mq39LzjSwrvVivN2E=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-XoQFNpQ9sy990mI/8atOEcUG6bpR/EhSdhMDozxkR7w=";
|
||||
cargoHash = "sha256-oiYV+o30NrLkewfEU0z8OzkaHFWExa2gbExewHBDxSo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -11,17 +11,17 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-elasticsearch-indexer";
|
||||
version = "5.12.0";
|
||||
version = "5.12.2";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-elasticsearch-indexer";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0uU2gUADLNMYD/4hBYqet3u45dgOC4R0e/N5Wl2g7IY=";
|
||||
hash = "sha256-dfDZIVDtCtph4zMS+3qT7dMlbUXZCIfr8rIBemHFMQ0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-J8sFOf2r4GwzYfMxiMEZcX7d93z2mNtqLEWHyJSiBDQ=";
|
||||
vendorHash = "sha256-LwBc/eQ2AQan8SsH+kugAeUv4O31WOx3Qnd1tB580wY=";
|
||||
|
||||
buildInputs = [ icu ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-pages";
|
||||
version = "18.7.2";
|
||||
version = "18.8.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-pages";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VArGJECx6IxX+AWAZCXNAS4qmGYDkSUYFJbhlZJ2W0M=";
|
||||
hash = "sha256-OmIhZwNmuOGYpBe32EYXVw4nX7XArkxdj3uoP9qurN4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-AZIv/CU01OAbn5faE4EkSuDCakYzDjRprB5ox5tIlck=";
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
{
|
||||
"version": "18.7.2",
|
||||
"repo_hash": "sha256-9FXr1hcCUNo0VN+R2sJ8fyBdBD/CKtpuuvCBLhLy9Us=",
|
||||
"yarn_hash": "sha256-GJiC43MNEK1Lr2GxX/eq4TbbiQunY0+/FJ4De0iEiqw=",
|
||||
"frontend_islands_yarn_hash": "sha256-JdotqUWmbmWUB/uB0PxrY8igm+kbTH230Okk4+J7NsE=",
|
||||
"version": "18.8.3",
|
||||
"repo_hash": "sha256-c9e6HhJ1ERXSMHYW+MHTVzxpqtUIfVHrlIUlCJ+zX0A=",
|
||||
"yarn_hash": "sha256-s4+NpzynaR5ab1DlXRMmtOeFZCwpexMoWjwX00hnx5o=",
|
||||
"frontend_islands_yarn_hash": "sha256-DiGj3eJMLnlWBTePwGmEvmY9d1Li3p/Y6h3GtZnsvhg=",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v18.7.2-ee",
|
||||
"rev": "v18.8.3-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "18.7.2",
|
||||
"GITLAB_KAS_VERSION": "18.7.2",
|
||||
"GITLAB_PAGES_VERSION": "18.7.2",
|
||||
"GITALY_SERVER_VERSION": "18.8.3",
|
||||
"GITLAB_KAS_VERSION": "18.8.3",
|
||||
"GITLAB_PAGES_VERSION": "18.8.3",
|
||||
"GITLAB_SHELL_VERSION": "14.45.5",
|
||||
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.12.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "18.7.2"
|
||||
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.12.2",
|
||||
"GITLAB_WORKHORSE_VERSION": "18.8.3"
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -10,7 +10,7 @@ in
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "18.7.2";
|
||||
version = "18.8.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
|
||||
@@ -194,7 +194,9 @@ let
|
||||
hash = data.yarn_hash;
|
||||
};
|
||||
frontendIslandsYarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = src + "/ee/frontend_islands/yarn.lock";
|
||||
# Revert to this when GitLab fixes their frontend_islands yarn.lock
|
||||
# yarnLock = src + "/ee/frontend_islands/yarn.lock";
|
||||
yarnLock = ./ee-frontend-islands-yarn.lock;
|
||||
hash = data.frontend_islands_yarn_hash;
|
||||
};
|
||||
|
||||
@@ -218,6 +220,14 @@ let
|
||||
# [1]: https://gitlab.com/gitlab-org/gitlab/-/commit/99c0fac52b10cd9df62bbe785db799352a2d9028
|
||||
./Remove-unsupported-database-names.patch
|
||||
];
|
||||
|
||||
# Remove once GitLab fixed their frontend_islands yarn.lock
|
||||
postPatch = ''
|
||||
rm ee/frontend_islands/yarn.lock
|
||||
cp ${./ee-frontend-islands-yarn.lock} ee/frontend_islands/yarn.lock
|
||||
chmod 777 ee/frontend_islands/yarn.lock
|
||||
'';
|
||||
|
||||
# One of the patches uses this variable - if it's unset, execution
|
||||
# of rake tasks fails.
|
||||
GITLAB_LOG_PATH = "log";
|
||||
|
||||
@@ -38,9 +38,9 @@ gem 'bootsnap', '~> 1.18.6', require: false, feature_category: :shared # rubocop
|
||||
# Avoid the precompiled native gems because Omnibus needs to build this to ensure
|
||||
# LD_LIBRARY_PATH is correct: https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7730
|
||||
if RUBY_PLATFORM.include?('darwin')
|
||||
gem 'ffi', '~> 1.17.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
|
||||
gem 'ffi', '~> 1.17.3', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
|
||||
else
|
||||
gem 'ffi', '~> 1.17.2', force_ruby_platform: true, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
|
||||
gem 'ffi', '~> 1.17.3', force_ruby_platform: true, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
|
||||
end
|
||||
|
||||
gem 'openssl', '~> 3.3.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
|
||||
@@ -141,7 +141,7 @@ gem 'acme-client', '~> 2.0.19', feature_category: :pages
|
||||
gem 'browser', '~> 5.3.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
|
||||
|
||||
# OS detection for usage ping
|
||||
gem 'ohai', '~> 18.1', feature_category: :product_analytics
|
||||
gem 'ohai', '~> 19.1.16', feature_category: :product_analytics
|
||||
|
||||
# GPG
|
||||
gem 'gpgme', '~> 2.0.24', feature_category: :source_code_management
|
||||
@@ -264,7 +264,7 @@ gem 'asciidoctor', '~> 2.0.18', feature_category: :markdown
|
||||
gem 'asciidoctor-include-ext', '~> 0.4.0', require: false, feature_category: :markdown
|
||||
gem 'asciidoctor-plantuml', '~> 0.0.16', feature_category: :markdown
|
||||
gem 'asciidoctor-kroki', '~> 0.10.0', require: false, feature_category: :markdown
|
||||
gem 'rouge', '~> 4.6.1', feature_category: :markdown
|
||||
gem 'rouge', '~> 4.7.0', feature_category: :markdown
|
||||
gem 'truncato', '~> 0.7.13', feature_category: :team_planning
|
||||
gem 'nokogiri', '~> 1.18', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
|
||||
gem 'gitlab-glfm-markdown', '~> 0.0.39', feature_category: :markdown
|
||||
@@ -293,7 +293,7 @@ gem 'state_machines-activerecord', '~> 0.100.0', feature_category: :shared # rub
|
||||
|
||||
# Background jobs
|
||||
gem 'sidekiq', path: 'vendor/gems/sidekiq', require: 'sidekiq', feature_category: :scalability
|
||||
gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability
|
||||
gem 'sidekiq-cron', '~> 2.3.0', feature_category: :scalability
|
||||
gem 'gitlab-sidekiq-fetcher',
|
||||
path: 'vendor/gems/sidekiq-reliable-fetch',
|
||||
require: 'sidekiq-reliable-fetch',
|
||||
@@ -377,7 +377,7 @@ gem 'rack-proxy', '~> 0.7.7', feature_category: :shared # rubocop:todo Gemfile/M
|
||||
gem 'cssbundling-rails', '1.4.3', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
|
||||
gem 'terser', '1.0.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
|
||||
|
||||
gem 'click_house-client', '0.8.4', feature_category: :database
|
||||
gem 'click_house-client', '0.8.6', feature_category: :database
|
||||
gem 'addressable', '~> 2.8', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
|
||||
gem 'gon', '~> 6.5.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
|
||||
gem 'request_store', '~> 1.7.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
|
||||
@@ -598,7 +598,7 @@ group :test do
|
||||
# Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
|
||||
gem 'derailed_benchmarks', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
|
||||
|
||||
gem 'gitlab_quality-test_tooling', '~> 3.1.0', require: false, feature_category: :tooling
|
||||
gem 'gitlab_quality-test_tooling', '~> 3.3.0', require: false, feature_category: :tooling
|
||||
end
|
||||
|
||||
gem 'octokit', '~> 9.0', feature_category: :importers
|
||||
@@ -643,14 +643,14 @@ gem 'grpc', '~> 1.76.0', feature_category: :shared # rubocop:todo Gemfile/Missin
|
||||
|
||||
gem 'google-protobuf', '>= 3.25', '< 5.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
|
||||
|
||||
gem 'toml-rb', '~> 2.2.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
|
||||
gem 'toml-rb', '~> 4.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
|
||||
|
||||
# Feature toggles
|
||||
gem 'flipper', '~> 0.28.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
|
||||
gem 'flipper-active_record', '~> 0.28.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
|
||||
gem 'flipper-active_support_cache_store', '~> 0.28.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
|
||||
gem 'unleash', '~> 3.2.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
|
||||
gem 'gitlab-experiment', '~> 1.1.0', feature_category: :acquisition
|
||||
gem 'gitlab-experiment', '~> 1.2.0', feature_category: :acquisition
|
||||
|
||||
# Structured logging
|
||||
gem 'lograge', '~> 0.5', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
|
||||
@@ -665,7 +665,7 @@ gem 'countries', '~> 4.0.0', feature_category: :shared # rubocop:todo Gemfile/Mi
|
||||
gem 'retriable', '~> 3.1.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
|
||||
|
||||
# LRU cache
|
||||
gem 'lru_redux', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
|
||||
gem 'lru_redux', feature_category: :importers
|
||||
|
||||
# Locked as long as quoted-printable encoding issues are not resolved
|
||||
# Monkey-patched in `config/initializers/mail_encoding_patch.rb`
|
||||
@@ -747,7 +747,7 @@ gem 'paper_trail', '~> 16.0', feature_category: :workspaces
|
||||
|
||||
gem "i18n_data", "~> 0.13.1", feature_category: :system_access
|
||||
|
||||
gem "gitlab-cloud-connector", "~> 1.35", require: 'gitlab/cloud_connector', feature_category: :plan_provisioning
|
||||
gem "gitlab-cloud-connector", "~> 1.40", require: 'gitlab/cloud_connector', feature_category: :plan_provisioning
|
||||
|
||||
gem "gvltools", "~> 0.4.0", feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
|
||||
|
||||
|
||||
@@ -220,7 +220,7 @@ GEM
|
||||
nkf
|
||||
rexml
|
||||
RedCloth (4.3.4)
|
||||
acme-client (2.0.27)
|
||||
acme-client (2.0.30)
|
||||
base64 (~> 0.2)
|
||||
faraday (>= 1.0, < 3.0.0)
|
||||
faraday-retry (>= 1.0, < 3.0.0)
|
||||
@@ -317,7 +317,7 @@ GEM
|
||||
jwt (>= 1.4)
|
||||
zeitwerk (>= 2.6.7)
|
||||
arr-pm (0.0.12)
|
||||
asciidoctor (2.0.23)
|
||||
asciidoctor (2.0.26)
|
||||
asciidoctor-include-ext (0.4.0)
|
||||
asciidoctor (>= 1.5.6, < 3.0.0)
|
||||
asciidoctor-kroki (0.10.0)
|
||||
@@ -435,7 +435,7 @@ GEM
|
||||
cork
|
||||
nap
|
||||
open4 (~> 1.3)
|
||||
click_house-client (0.8.4)
|
||||
click_house-client (0.8.6)
|
||||
activerecord (>= 7.0, < 9.0)
|
||||
activesupport (>= 7.0, < 9.0)
|
||||
addressable (~> 2.8)
|
||||
@@ -466,6 +466,9 @@ GEM
|
||||
safe_yaml (~> 1.0.0)
|
||||
crass (1.0.6)
|
||||
creole (0.5.0)
|
||||
cronex (0.15.0)
|
||||
tzinfo
|
||||
unicode (>= 0.4.4.5)
|
||||
css_parser (1.14.0)
|
||||
addressable
|
||||
cssbundling-rails (1.4.3)
|
||||
@@ -643,7 +646,7 @@ GEM
|
||||
prime
|
||||
racc
|
||||
ffaker (2.25.0)
|
||||
ffi (1.17.2)
|
||||
ffi (1.17.3)
|
||||
ffi-compiler (1.0.1)
|
||||
ffi (>= 1.0.0)
|
||||
rake
|
||||
@@ -733,15 +736,15 @@ GEM
|
||||
git (1.19.1)
|
||||
addressable (~> 2.8)
|
||||
rchardet (~> 1.8)
|
||||
gitaly (18.7.0.pre.rc1)
|
||||
gitaly (18.7.0)
|
||||
grpc (~> 1.0)
|
||||
gitlab (4.19.0)
|
||||
httparty (~> 0.20)
|
||||
terminal-table (>= 1.5.1)
|
||||
gitlab-chronic (0.10.6)
|
||||
numerizer (~> 0.2)
|
||||
gitlab-cloud-connector (1.36.0)
|
||||
activesupport (~> 7.0)
|
||||
gitlab-cloud-connector (1.40.0)
|
||||
activesupport (>= 7.0)
|
||||
jwt (~> 2.9)
|
||||
gitlab-crystalball (1.1.1)
|
||||
git (< 4)
|
||||
@@ -750,7 +753,7 @@ GEM
|
||||
danger (>= 9.3.0)
|
||||
danger-gitlab (>= 8.0.0)
|
||||
rake (~> 13.0)
|
||||
gitlab-experiment (1.1.0)
|
||||
gitlab-experiment (1.2.0)
|
||||
activesupport (>= 3.0)
|
||||
request_store (>= 1.0)
|
||||
gitlab-fog-azure-rm (2.4.0)
|
||||
@@ -791,14 +794,14 @@ GEM
|
||||
activesupport (>= 5.2.0)
|
||||
rake (~> 13.0)
|
||||
snowplow-tracker (~> 0.8.0)
|
||||
gitlab-secret_detection (0.38.1)
|
||||
gitlab-secret_detection (0.39.1)
|
||||
grpc (>= 1.63.0, < 2)
|
||||
grpc_reflection (~> 0.1)
|
||||
parallel (~> 1)
|
||||
re2 (~> 2.7)
|
||||
sentry-ruby (~> 5.22)
|
||||
stackprof (~> 0.2.27)
|
||||
toml-rb (~> 2.2)
|
||||
toml-rb (~> 4.1)
|
||||
gitlab-security_report_schemas (0.1.3.min15.0.0.max15.2.3)
|
||||
activesupport (>= 6, < 8)
|
||||
json_schemer (~> 2.3.0)
|
||||
@@ -819,7 +822,7 @@ GEM
|
||||
omniauth (>= 1.3, < 3)
|
||||
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
|
||||
rubyntlm (~> 0.5)
|
||||
gitlab_quality-test_tooling (3.1.0)
|
||||
gitlab_quality-test_tooling (3.3.0)
|
||||
activesupport (>= 7.0)
|
||||
amatch (~> 0.4.1)
|
||||
fog-google (~> 1.24, >= 1.24.1)
|
||||
@@ -924,7 +927,7 @@ GEM
|
||||
gapic-common (>= 0.20.0, < 2.a)
|
||||
google-cloud-errors (~> 1.0)
|
||||
google-logging-utils (0.1.0)
|
||||
google-protobuf (4.33.1)
|
||||
google-protobuf (4.33.2)
|
||||
bigdecimal
|
||||
rake (>= 13)
|
||||
googleapis-common-protos (1.7.0)
|
||||
@@ -989,7 +992,8 @@ GEM
|
||||
google-protobuf (>= 3.18, < 5.a)
|
||||
googleapis-common-protos (~> 1.7.0)
|
||||
grpc (~> 1.41)
|
||||
grpc_reflection (0.1.1)
|
||||
grpc_reflection (0.4.0)
|
||||
google-protobuf (>= 4.31.0)
|
||||
grpc
|
||||
gssapi (1.3.1)
|
||||
ffi (>= 1.0.1)
|
||||
@@ -1215,7 +1219,7 @@ GEM
|
||||
tomlrb
|
||||
mixlib-log (3.2.3)
|
||||
ffi (>= 1.15.5)
|
||||
mixlib-shellout (3.2.7)
|
||||
mixlib-shellout (3.3.9)
|
||||
chef-utils
|
||||
mize (0.6.1)
|
||||
msgpack (1.5.4)
|
||||
@@ -1274,20 +1278,21 @@ GEM
|
||||
octokit (9.2.0)
|
||||
faraday (>= 1, < 3)
|
||||
sawyer (~> 0.9)
|
||||
ohai (18.1.18)
|
||||
chef-config (>= 14.12, < 19)
|
||||
chef-utils (>= 16.0, < 19)
|
||||
ffi (~> 1.9)
|
||||
ohai (19.1.16)
|
||||
base64
|
||||
chef-config (>= 14.12, < 20)
|
||||
chef-utils (>= 16.0, < 20)
|
||||
ffi (>= 1.15.5)
|
||||
ffi-yajl (~> 2.2)
|
||||
ipaddress
|
||||
mixlib-cli (>= 1.7.0)
|
||||
mixlib-config (>= 2.0, < 4.0)
|
||||
mixlib-log (>= 2.0.1, < 4.0)
|
||||
mixlib-shellout (~> 3.2, >= 3.2.5)
|
||||
mixlib-shellout (~> 3.3.6)
|
||||
plist (~> 3.1)
|
||||
train-core
|
||||
wmi-lite (~> 1.0)
|
||||
oj (3.16.12)
|
||||
oj (3.16.13)
|
||||
bigdecimal (>= 3.0)
|
||||
ostruct (>= 0.2)
|
||||
oj-introspect (0.8.0)
|
||||
@@ -1681,7 +1686,7 @@ GEM
|
||||
rexml (3.4.4)
|
||||
rinku (2.0.0)
|
||||
rotp (6.3.0)
|
||||
rouge (4.6.1)
|
||||
rouge (4.7.0)
|
||||
rqrcode (2.2.0)
|
||||
chunky_png (~> 1.0)
|
||||
rqrcode_core (~> 1.0)
|
||||
@@ -1822,10 +1827,11 @@ GEM
|
||||
shellany (0.0.1)
|
||||
shoulda-matchers (6.4.0)
|
||||
activesupport (>= 5.2.0)
|
||||
sidekiq-cron (1.12.0)
|
||||
fugit (~> 1.8)
|
||||
sidekiq-cron (2.3.1)
|
||||
cronex (>= 0.13.0)
|
||||
fugit (~> 1.8, >= 1.11.1)
|
||||
globalid (>= 1.0.1)
|
||||
sidekiq (>= 6)
|
||||
sidekiq (>= 6.5.0)
|
||||
sigdump (0.2.5)
|
||||
signet (0.19.0)
|
||||
addressable (~> 2.8)
|
||||
@@ -1943,8 +1949,9 @@ GEM
|
||||
timfel-krb5-auth (0.8.3)
|
||||
tins (1.31.1)
|
||||
sync
|
||||
toml-rb (2.2.0)
|
||||
toml-rb (4.1.0)
|
||||
citrus (~> 3.0, > 3.0)
|
||||
racc (~> 1.7)
|
||||
tomlrb (1.3.0)
|
||||
tpm-key_attestation (0.12.0)
|
||||
bindata (~> 2.4)
|
||||
@@ -2000,6 +2007,7 @@ GEM
|
||||
unf (0.1.4)
|
||||
unf_ext
|
||||
unf_ext (0.0.8.2)
|
||||
unicode (0.4.4.5)
|
||||
unicode-display_width (2.4.2)
|
||||
unicode-emoji (4.0.4)
|
||||
unicode_utils (1.4.0)
|
||||
@@ -2123,7 +2131,7 @@ DEPENDENCIES
|
||||
carrierwave (~> 1.3)
|
||||
charlock_holmes (~> 0.7.9)
|
||||
circuitbox (= 2.0.0)
|
||||
click_house-client (= 0.8.4)
|
||||
click_house-client (= 0.8.6)
|
||||
commonmarker (~> 0.23.10)
|
||||
concurrent-ruby (~> 1.1)
|
||||
connection_pool (~> 2.5.3)
|
||||
@@ -2165,7 +2173,7 @@ DEPENDENCIES
|
||||
faraday_middleware-aws-sigv4 (~> 1.0.1)
|
||||
fast_blank (~> 1.0.1)
|
||||
ffaker (~> 2.24)
|
||||
ffi (~> 1.17.2)
|
||||
ffi (~> 1.17.3)
|
||||
flipper (~> 0.28.0)
|
||||
flipper-active_record (~> 0.28.0)
|
||||
flipper-active_support_cache_store (~> 0.28.0)
|
||||
@@ -2183,11 +2191,11 @@ DEPENDENCIES
|
||||
gitlab-active-context!
|
||||
gitlab-backup-cli!
|
||||
gitlab-chronic (~> 0.10.5)
|
||||
gitlab-cloud-connector (~> 1.35)
|
||||
gitlab-cloud-connector (~> 1.40)
|
||||
gitlab-crystalball (~> 1.1.0)
|
||||
gitlab-dangerfiles (~> 4.10.0)
|
||||
gitlab-duo-workflow-service-client (~> 0.6)!
|
||||
gitlab-experiment (~> 1.1.0)
|
||||
gitlab-experiment (~> 1.2.0)
|
||||
gitlab-fog-azure-rm (~> 2.4.0)
|
||||
gitlab-glfm-markdown (~> 0.0.39)
|
||||
gitlab-grape-openapi!
|
||||
@@ -2212,7 +2220,7 @@ DEPENDENCIES
|
||||
gitlab-utils!
|
||||
gitlab_chronic_duration (~> 0.12)
|
||||
gitlab_omniauth-ldap (~> 2.3.0)
|
||||
gitlab_quality-test_tooling (~> 3.1.0)
|
||||
gitlab_quality-test_tooling (~> 3.3.0)
|
||||
gitlab_query_language (~> 0.20.11)
|
||||
gon (~> 6.5.0)
|
||||
google-apis-androidpublisher_v3 (~> 0.86.0)
|
||||
@@ -2298,7 +2306,7 @@ DEPENDENCIES
|
||||
nokogiri (~> 1.18)
|
||||
oauth2 (~> 2.0)
|
||||
octokit (~> 9.0)
|
||||
ohai (~> 18.1)
|
||||
ohai (~> 19.1.16)
|
||||
oj (~> 3.16.0, >= 3.16.10)
|
||||
oj-introspect (~> 0.8)
|
||||
omniauth (~> 2.1.0)
|
||||
@@ -2381,7 +2389,7 @@ DEPENDENCIES
|
||||
responders (~> 3.0)
|
||||
retriable (~> 3.1.2)
|
||||
rexml (~> 3.4.0)
|
||||
rouge (~> 4.6.1)
|
||||
rouge (~> 4.7.0)
|
||||
rqrcode (~> 2.2)
|
||||
rspec-benchmark (~> 0.6.0)
|
||||
rspec-parameterized (~> 1.0, >= 1.0.2)
|
||||
@@ -2408,7 +2416,7 @@ DEPENDENCIES
|
||||
sentry-sidekiq (~> 5.23.0)
|
||||
shoulda-matchers (~> 6.4.0)
|
||||
sidekiq!
|
||||
sidekiq-cron (~> 1.12.0)
|
||||
sidekiq-cron (~> 2.3.0)
|
||||
sigdump (~> 0.2.4)
|
||||
simple_po_parser (~> 1.1.6)
|
||||
simplecov (~> 0.22)
|
||||
@@ -2436,7 +2444,7 @@ DEPENDENCIES
|
||||
test_file_finder (~> 0.3.1)
|
||||
thrift (~> 0.22.0)
|
||||
timfel-krb5-auth (~> 0.8)
|
||||
toml-rb (~> 2.2.0)
|
||||
toml-rb (~> 4.1)
|
||||
truncato (~> 0.7.13)
|
||||
tty-prompt (~> 0.23)
|
||||
typhoeus (~> 1.4.0)
|
||||
|
||||
@@ -9,10 +9,10 @@ src: {
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0gikb7zms7bg3621ipkk1carbzvwiybqbvnci1yrsh7r0fb0zd8x";
|
||||
sha256 = "05h6ly5jpdpvx18fvz8ryr86z0bxv3xkr9w0wg6l7qgmrdpqk1zx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.27";
|
||||
version = "2.0.30";
|
||||
};
|
||||
actioncable = {
|
||||
dependencies = [
|
||||
@@ -399,10 +399,10 @@ src: {
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1wyxgwmnz9bw377r3lba26b090hbsq9qnbw8575a1prpy83qh82j";
|
||||
sha256 = "1hbin3j8wynl2fpqa3d6vb932pyngyfn8j2q6gbbn1n23z7srqqn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.23";
|
||||
version = "2.0.26";
|
||||
};
|
||||
asciidoctor-include-ext = {
|
||||
dependencies = [ "asciidoctor" ];
|
||||
@@ -1144,10 +1144,10 @@ src: {
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "067xbpp8ihfnzq7cnj1m9xnrm08ng8jdm2jfvnsqq3nkkwqscy42";
|
||||
sha256 = "0n598bfralfx7isgf22f6k28zy5ijrywdzgxk4brp30q5ad31rgm";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.8.4";
|
||||
version = "0.8.6";
|
||||
};
|
||||
coderay = {
|
||||
groups = [
|
||||
@@ -1350,6 +1350,20 @@ src: {
|
||||
};
|
||||
version = "0.5.0";
|
||||
};
|
||||
cronex = {
|
||||
dependencies = [
|
||||
"tzinfo"
|
||||
"unicode"
|
||||
];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "11i1psgzcqzj4a7p62vy56i5p8s00d29y9rf9wf9blpshph99ir1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.15.0";
|
||||
};
|
||||
css_parser = {
|
||||
dependencies = [ "addressable" ];
|
||||
groups = [
|
||||
@@ -2364,15 +2378,16 @@ src: {
|
||||
"default"
|
||||
"development"
|
||||
"kerberos"
|
||||
"monorepo"
|
||||
"test"
|
||||
];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "19kdyjg3kv7x0ad4xsd4swy5izsbb1vl1rpb6qqcqisr5s23awi9";
|
||||
sha256 = "0k1xaqw2jk13q3ss7cnyvkp8fzp75dk4kazysrxgfd1rpgvkk7qf";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.17.2";
|
||||
version = "1.17.3";
|
||||
};
|
||||
ffi-compiler = {
|
||||
dependencies = [
|
||||
@@ -2774,10 +2789,10 @@ src: {
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0a17fm4z0kdrmkszaf6cs8z28z4v27awg78wfn88pg33diqbhy1p";
|
||||
sha256 = "0kkbkaqjbpriw8380hhcs0fgad14ny1j070g764sqblg0wdhspwi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "18.7.0.pre.rc1";
|
||||
version = "18.7.0";
|
||||
};
|
||||
gitlab = {
|
||||
dependencies = [
|
||||
@@ -2871,10 +2886,10 @@ src: {
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0x5qk0llskwk50qirlpmi1z4jfywfm3m1d6j9d0hsncjlphawyyy";
|
||||
sha256 = "0wkffbl793jvkjw3qdfqfb1j4adsvyakdv7sc0g3cdp2q6lrrmah";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.36.0";
|
||||
version = "1.40.0";
|
||||
};
|
||||
gitlab-crystalball = {
|
||||
dependencies = [
|
||||
@@ -2931,10 +2946,10 @@ src: {
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0hz240khah65vlk6b4b6zqhbrg394dwyp6h5526krniymfla9i9k";
|
||||
sha256 = "0rvfwrb4pp1x8drax4riz1ich9h9xbpsxv15y7vi7wapi6zl0pa7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
};
|
||||
gitlab-fog-azure-rm = {
|
||||
dependencies = [
|
||||
@@ -3186,10 +3201,10 @@ src: {
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1j8m7bpikr8gcq92xlqia6dk9l17ncd21i13phd2x2m3sydi5m0w";
|
||||
sha256 = "02h049krvlxg9ya8h1ljrdv0mws843cyv8kxf8g9ww46w7kbaaxb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.38.1";
|
||||
version = "0.39.1";
|
||||
};
|
||||
gitlab-security_report_schemas = {
|
||||
dependencies = [
|
||||
@@ -3312,14 +3327,18 @@ src: {
|
||||
"table_print"
|
||||
"zeitwerk"
|
||||
];
|
||||
groups = [ "test" ];
|
||||
groups = [
|
||||
"development"
|
||||
"monorepo"
|
||||
"test"
|
||||
];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1x2nxiii42f74mhd8bmmf58nfqyrxxqvkhd6h5hv0vjm9vrb030c";
|
||||
sha256 = "05fmy56vcya6z6kpbw0vpyilc7aw4k2y1slcifb44wdalwkrbf7x";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.1.0";
|
||||
version = "3.3.0";
|
||||
};
|
||||
gitlab_query_language = {
|
||||
dependencies = [ "rb_sys" ];
|
||||
@@ -3753,10 +3772,10 @@ src: {
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1v24iiaz12rpvknn8k279db0y2is275qzrs2s0zhmcq0gamvrnc1";
|
||||
sha256 = "0583agdf2jvnq78scf8008bddrmbybn27ylyydg6bza2qvb510bl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.33.1";
|
||||
version = "4.33.2";
|
||||
};
|
||||
googleapis-common-protos = {
|
||||
dependencies = [
|
||||
@@ -4007,15 +4026,18 @@ src: {
|
||||
version = "1.11.0";
|
||||
};
|
||||
grpc_reflection = {
|
||||
dependencies = [ "grpc" ];
|
||||
dependencies = [
|
||||
"google-protobuf"
|
||||
"grpc"
|
||||
];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0yq9344fbjgkzxb54chwf26sf62iv5zv57js7dihg94lyw9dyixw";
|
||||
sha256 = "1kzhwgj3kqghaicx6x8x29srfdm3n78v7022dabiz0j9y11yglvj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.1";
|
||||
version = "0.4.0";
|
||||
};
|
||||
gssapi = {
|
||||
dependencies = [ "ffi" ];
|
||||
@@ -5316,10 +5338,10 @@ src: {
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0zkwg76y96nkh1mv0k92ybq46cr06v1wmic16129ls3yqzwx3xj6";
|
||||
sha256 = "126k9zgxwj726gi0q0ywj4kdzf1gfm8z16i1nn7dw9kmn3imxpqf";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2.7";
|
||||
version = "3.3.9";
|
||||
};
|
||||
mize = {
|
||||
groups = [
|
||||
@@ -5753,6 +5775,7 @@ src: {
|
||||
};
|
||||
ohai = {
|
||||
dependencies = [
|
||||
"base64"
|
||||
"chef-config"
|
||||
"chef-utils"
|
||||
"ffi"
|
||||
@@ -5770,10 +5793,10 @@ src: {
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1w0zrk1n6n7jl493k4vv5xaiszbmxsmaffy9xvykbfawjjb83vj2";
|
||||
sha256 = "1p8yimcg2wz7sqf8s6slla2izdclris4cgyyhm8j4kvbchcmix5y";
|
||||
type = "gem";
|
||||
};
|
||||
version = "18.1.18";
|
||||
version = "19.1.16";
|
||||
};
|
||||
oj = {
|
||||
dependencies = [
|
||||
@@ -5784,10 +5807,10 @@ src: {
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0mmmswza8f4divl0mvkfq62pcdvm8c56j854wv7z9g6s0rmav7xd";
|
||||
sha256 = "00q33rm7lpfc319pf6him05ak76gfy7i04iiddrz317q7swbq55i";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.16.12";
|
||||
version = "3.16.13";
|
||||
};
|
||||
oj-introspect = {
|
||||
dependencies = [ "oj" ];
|
||||
@@ -7806,10 +7829,10 @@ src: {
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1pkp5icgm7s10b2n6b2pzbdsfiv0l5sxqyizx55qdmlpaxnk8xah";
|
||||
sha256 = "0fd77qcz603mli4lyi97cjzkv02hsfk60m495qv5qcn02mkqk9fv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.6.1";
|
||||
version = "4.7.0";
|
||||
};
|
||||
rqrcode = {
|
||||
dependencies = [
|
||||
@@ -8589,6 +8612,7 @@ src: {
|
||||
};
|
||||
sidekiq-cron = {
|
||||
dependencies = [
|
||||
"cronex"
|
||||
"fugit"
|
||||
"globalid"
|
||||
"sidekiq"
|
||||
@@ -8597,10 +8621,10 @@ src: {
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0v09lg8kza19jmigqv5hx2ibhm75j6pa639sfy4bv2208l50hqv6";
|
||||
sha256 = "1b2aqj17izziipb6wvsa8jr60ng8w8mal7acfkf316i8faikvawn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.12.0";
|
||||
version = "2.3.1";
|
||||
};
|
||||
sigdump = {
|
||||
groups = [
|
||||
@@ -9338,15 +9362,18 @@ src: {
|
||||
version = "1.31.1";
|
||||
};
|
||||
toml-rb = {
|
||||
dependencies = [ "citrus" ];
|
||||
dependencies = [
|
||||
"citrus"
|
||||
"racc"
|
||||
];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "19nr4wr5accc6l2y3avn7b02lqmk9035zxq42234k7fcqd5cbqm1";
|
||||
sha256 = "0ijqv5c212n9hcnhk028i2cyyr1jdyjq6jzh3f406iwyak26wi8l";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.2.0";
|
||||
version = "4.1.0";
|
||||
};
|
||||
tomlrb = {
|
||||
groups = [ "default" ];
|
||||
@@ -9642,6 +9669,16 @@ src: {
|
||||
};
|
||||
version = "0.0.8.2";
|
||||
};
|
||||
unicode = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1mx9lwzy021lpcqql5kn4yi20njhf5h7c7wxm2fx51p1r2zr9wj2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.4.4.5";
|
||||
};
|
||||
unicode-display_width = {
|
||||
groups = [
|
||||
"danger"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -I nixpkgs=../../../.. -i python3 -p bundix bundler nix-update nix python3 python3Packages.requests python3Packages.click python3Packages.click-log python3Packages.packaging prefetch-yarn-deps git go
|
||||
#! nix-shell -I nixpkgs=../../../.. -i python3 -p bundix bundler nix-update nix nurl python3 python3Packages.requests python3Packages.click python3Packages.click-log python3Packages.packaging prefetch-yarn-deps git go
|
||||
|
||||
import click
|
||||
import click_log
|
||||
@@ -249,15 +249,57 @@ def update_gitaly():
|
||||
data = _get_data_json()
|
||||
gitaly_server_version = data['passthru']['GITALY_SERVER_VERSION']
|
||||
repo = GitLabRepo(repo="gitaly")
|
||||
gitaly_dir = pathlib.Path(__file__).parent / 'gitaly'
|
||||
|
||||
makefile = repo.get_file("Makefile", f"v{gitaly_server_version}")
|
||||
makefile += "\nprint-%:;@echo $($*)\n"
|
||||
|
||||
git_version = subprocess.run(["make", "-f", "-", "print-GIT_VERSION"], check=True, input=makefile, text=True, capture_output=True).stdout.strip()
|
||||
|
||||
git_rev = subprocess.run(["make", "-f", "-", "print-GIT_VERSION"], check=True, input=makefile, text=True, capture_output=True).stdout.strip()
|
||||
_call_nix_update("gitaly", gitaly_server_version)
|
||||
_call_nix_update("gitaly.git", git_version)
|
||||
|
||||
# Gitaly Git currently uses just a commit without any tag making nix-update impossible to use.
|
||||
git_repo = GitLabRepo(repo="git")
|
||||
git_version_generator = git_repo.get_file("GIT-VERSION-GEN", git_rev)
|
||||
git_major_minor = None
|
||||
for line in git_version_generator.splitlines():
|
||||
if line.startswith("DEF_VER="):
|
||||
git_major_minor = line.strip("DEF_VER=v").split(".GIT")[0]
|
||||
break
|
||||
if not git_major_minor:
|
||||
raise RuntimeError("Could not find gitaly's git version.")
|
||||
|
||||
git_data_file_path = NIXPKGS_PATH / "pkgs" / "by-name" / "gi" / "gitaly" / "git-data.json"
|
||||
|
||||
git_repo_hash = (
|
||||
subprocess.check_output(
|
||||
[
|
||||
"nurl",
|
||||
"--fetcher",
|
||||
"fetchFromGitLab",
|
||||
"-n",
|
||||
NIXPKGS_PATH,
|
||||
"-H",
|
||||
"-a",
|
||||
"leaveDotGit",
|
||||
"true",
|
||||
"https://gitlab.com/gitlab-org/git",
|
||||
git_rev
|
||||
]
|
||||
)
|
||||
.decode("utf-8")
|
||||
.strip()
|
||||
)
|
||||
git_data = {
|
||||
# We use the commit hash here as part of the dervations' version because it would be quite hard to find out
|
||||
# the actual commit date, and even than we don't want to have `unstable` as part of the derivation as GitLab
|
||||
# considers this git version stable.
|
||||
"version": f"{git_major_minor}-{git_rev[:8]}",
|
||||
"rev": git_rev,
|
||||
"hash": git_repo_hash
|
||||
}
|
||||
with open(git_data_file_path.as_posix(), "w") as f:
|
||||
json.dump(git_data, f, indent=2)
|
||||
f.write("\n")
|
||||
|
||||
|
||||
|
||||
@cli.command("update-gitlab-pages")
|
||||
|
||||
Reference in New Issue
Block a user