From bebcc0507301e882cb8f8e8cd37229f34a0487bb Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Fri, 26 Jan 2024 15:42:54 +0900 Subject: [PATCH] Remove trailing whitespace in patch for `assets:compile` to suppress warning on build like below: Applying patch /etc/docker-gitlab/build/patches/0004-fix-raketask-gitlab-assets-compile.patch for gitlab-foss... :15: trailing whitespace. removal_targets += Dir.children(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR).map {|child| File.join(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR, child)} warning: 1 line adds whitespace errors. --- .../build/patches/0004-fix-raketask-gitlab-assets-compile.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch b/assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch index 7563b75a..a0877b83 100644 --- a/assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch +++ b/assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch @@ -12,7 +12,7 @@ index b8a6e7018767..5096d81ea63f 100644 + # Dir.glob("*") ignores dotfiles (even it is fine to remove here), so list up children manually + removal_targets = Dir.glob('app/assets/javascripts/locale/**/app.js') + if Dir.exist?(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR) -+ removal_targets += Dir.children(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR).map {|child| File.join(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR, child)} ++ removal_targets += Dir.children(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR).map {|child| File.join(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR, child)} + end + FileUtils.rm_rf(removal_targets, secure: true)