From 0834b55a1de7b86a02f57985561b85cfcaaa4315 Mon Sep 17 00:00:00 2001 From: Balasankar 'Balu' C Date: Thu, 4 Apr 2024 08:39:11 +0000 Subject: [PATCH] Specify a dummy version for gitlab-backup-cli The `gitlab-backup-cli` wrapper should not cause a cache bust. This adds a dummy version to prevent it. Related https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8476 Signed-off-by: Balasankar 'Balu' C --- .rubocop_todo.yml | 1 + config/software/gitlab-backup-cli.rb | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 268f3b933..9b1449fe8 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -31,6 +31,7 @@ Fips/MD5: - 'config/software/gitlab-pg-ctl.rb' - 'config/software/gitlab-psql.rb' - 'config/software/gitlab-redis-cli.rb' + - 'config/software/gitlab-backup-cli.rb' - 'files/gitlab-cookbooks/gitlab/libraries/helpers/base_pg_helper.rb' - 'files/gitlab-cookbooks/gitlab/libraries/rails_migration_helper.rb' - 'files/gitlab-ctl-commands/lib/postgresql/password_hash.rb' diff --git a/config/software/gitlab-backup-cli.rb b/config/software/gitlab-backup-cli.rb index 9e6923a1b..065b91b76 100644 --- a/config/software/gitlab-backup-cli.rb +++ b/config/software/gitlab-backup-cli.rb @@ -14,6 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # + +require 'digest' + name 'gitlab-backup-cli' license 'Apache-2.0' @@ -21,6 +24,10 @@ license_file File.expand_path('LICENSE', Omnibus::Config.project_root) skip_transitive_dependency_licensing true +# This 'software' is self-contained in this file. Use the file contents +# to generate a version string. +default_version Digest::MD5.file(__FILE__).hexdigest + build do mkdir "#{install_dir}/bin/" # Create a wrapper for the gitlab-backup-cli tool