From 456d20cd4671e77520c1e11cec41d578d310f5c6 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sun, 14 Jul 2024 15:44:15 -0400 Subject: [PATCH 1/3] sync/shared-config: remove locked threads with Git. This should push it out in PRs. --- .github/actions/sync/shared-config.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/sync/shared-config.rb b/.github/actions/sync/shared-config.rb index f3c23edd..479c3439 100755 --- a/.github/actions/sync/shared-config.rb +++ b/.github/actions/sync/shared-config.rb @@ -183,7 +183,7 @@ def git(*args) "#{dependabot_config}\n", ) when deprecated_lock_threads - FileUtils.rm_f path + git "-C", target_directory, "rm", target_path.to_s else next if path == target_path.to_s From e47ae5db1f838d321f130124b9204b00fcda23c4 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sun, 14 Jul 2024 15:58:08 -0400 Subject: [PATCH 2/3] Update .github/actions/sync/shared-config.rb Co-authored-by: Ruoyu Zhong --- .github/actions/sync/shared-config.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/sync/shared-config.rb b/.github/actions/sync/shared-config.rb index 479c3439..07e81117 100755 --- a/.github/actions/sync/shared-config.rb +++ b/.github/actions/sync/shared-config.rb @@ -183,7 +183,7 @@ def git(*args) "#{dependabot_config}\n", ) when deprecated_lock_threads - git "-C", target_directory, "rm", target_path.to_s + git "-C", target_directory, "rm", path else next if path == target_path.to_s From 0b82353aad627ff39c3c0926b96469eafa6b2005 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sun, 14 Jul 2024 16:01:04 -0400 Subject: [PATCH 3/3] sync/shared-config: don't try to `git rm` if workflow doesn't exist. --- .github/actions/sync/shared-config.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/actions/sync/shared-config.rb b/.github/actions/sync/shared-config.rb index 07e81117..606ca7ab 100755 --- a/.github/actions/sync/shared-config.rb +++ b/.github/actions/sync/shared-config.rb @@ -183,6 +183,8 @@ def git(*args) "#{dependabot_config}\n", ) when deprecated_lock_threads + next unless target_path.exist? + git "-C", target_directory, "rm", path else next if path == target_path.to_s