From 13b13a758c665d4f0031a43687877111e80a48e7 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Wed, 2 Aug 2023 12:48:20 +0100 Subject: [PATCH] Remove discourse-canned-replies from official list (#22932) This plugin is no longer supported, and so we no longer need to run its tests in CI (removing the comment and the 'Canned Replies' value from the array caused syntax_tree to change to the `%w` syntax) --- lib/plugin/metadata.rb | 180 +++++++++++++++---------------- lib/tasks/plugin.rake | 4 +- spec/lib/plugin/metadata_spec.rb | 1 - 3 files changed, 89 insertions(+), 96 deletions(-) diff --git a/lib/plugin/metadata.rb b/lib/plugin/metadata.rb index 3f15d068641..f7ebbb47704 100644 --- a/lib/plugin/metadata.rb +++ b/lib/plugin/metadata.rb @@ -7,98 +7,94 @@ end class Plugin::Metadata OFFICIAL_PLUGINS ||= Set.new( - [ - # TODO: Remove this after everyone upgraded `discourse-canned-replies` - # to the renamed version. - "Canned Replies", - "discourse-adplugin", - "discourse-affiliate", - "discourse-ai", - "discourse-akismet", - "discourse-algolia", - "discourse-apple-auth", - "discourse-assign", - "discourse-auto-deactivate", - "discourse-automation", - "discourse-bbcode", - "discourse-bbcode-color", - "discourse-bcc", - "discourse-cakeday", - "discourse-calendar", - "discourse-canned-replies", - "discourse-categories-suppressed", - "discourse-category-experts", - "discourse-characters-required", - "discourse-chat-integration", - "discourse-code-review", - "discourse-crowd", - "discourse-data-explorer", - "discourse-details", - "discourse-docs", - "discourse-encrypt", - "discourse-follow", - "discourse-fontawesome-pro", - "discourse-footnote", - "discourse-gamification", - "discourse-github", - "discourse-gradle-issue", - "discourse-graphviz", - "discourse-group-tracker", - "discourse-invite-tokens", - "discourse-lazy-videos", - "discourse-local-dates", - "discourse-login-with-amazon", - "discourse-logster-rate-limit-checker", - "discourse-logster-transporter", - "discourse-lti", - "discourse-math", - "discourse-moderator-attention", - "discourse-narrative-bot", - "discourse-newsletter-integration", - "discourse-no-bump", - "discourse-oauth2-basic", - "discourse-openid-connect", - "discourse-patreon", - "discourse-perspective-api", - "discourse-linkedin-auth", - "discourse-microsoft-auth", - "discourse-policy", - "discourse-post-voting", - "discourse-presence", - "discourse-prometheus", - "discourse-prometheus-alert-receiver", - "discourse-push-notifications", - "discourse-reactions", - "discourse-restricted-replies", - "discourse-rss-polling", - "discourse-salesforce", - "discourse-saml", - "discourse-saved-searches", - "discourse-shared-edits", - "discourse-signatures", - "discourse-sitemap", - "discourse-solved", - "discourse-spoiler-alert", - "discourse-staff-alias", - "discourse-steam-login", - "discourse-subscriptions", - "discourse-teambuild", - "discourse-templates", - "discourse-tooltips", - "discourse-topic-voting", - "discourse-translator", - "discourse-user-card-badges", - "discourse-user-notes", - "discourse-vk-auth", - "discourse-whos-online", - "discourse-yearly-review", - "discourse-zendesk-plugin", - "discourse-zoom", - "docker_manager", - "chat", - "poll", - "styleguide", - "checklist", + %w[ + discourse-adplugin + discourse-affiliate + discourse-ai + discourse-akismet + discourse-algolia + discourse-apple-auth + discourse-assign + discourse-auto-deactivate + discourse-automation + discourse-bbcode + discourse-bbcode-color + discourse-bcc + discourse-cakeday + discourse-calendar + discourse-categories-suppressed + discourse-category-experts + discourse-characters-required + discourse-chat-integration + discourse-code-review + discourse-crowd + discourse-data-explorer + discourse-details + discourse-docs + discourse-encrypt + discourse-follow + discourse-fontawesome-pro + discourse-footnote + discourse-gamification + discourse-github + discourse-gradle-issue + discourse-graphviz + discourse-group-tracker + discourse-invite-tokens + discourse-lazy-videos + discourse-local-dates + discourse-login-with-amazon + discourse-logster-rate-limit-checker + discourse-logster-transporter + discourse-lti + discourse-math + discourse-moderator-attention + discourse-narrative-bot + discourse-newsletter-integration + discourse-no-bump + discourse-oauth2-basic + discourse-openid-connect + discourse-patreon + discourse-perspective-api + discourse-linkedin-auth + discourse-microsoft-auth + discourse-policy + discourse-post-voting + discourse-presence + discourse-prometheus + discourse-prometheus-alert-receiver + discourse-push-notifications + discourse-reactions + discourse-restricted-replies + discourse-rss-polling + discourse-salesforce + discourse-saml + discourse-saved-searches + discourse-shared-edits + discourse-signatures + discourse-sitemap + discourse-solved + discourse-spoiler-alert + discourse-staff-alias + discourse-steam-login + discourse-subscriptions + discourse-teambuild + discourse-templates + discourse-tooltips + discourse-topic-voting + discourse-translator + discourse-user-card-badges + discourse-user-notes + discourse-vk-auth + discourse-whos-online + discourse-yearly-review + discourse-zendesk-plugin + discourse-zoom + docker_manager + chat + poll + styleguide + checklist ], ) diff --git a/lib/tasks/plugin.rake b/lib/tasks/plugin.rake index 9711141902a..265a973766e 100644 --- a/lib/tasks/plugin.rake +++ b/lib/tasks/plugin.rake @@ -6,13 +6,11 @@ desc "install all official plugins (use GIT_WRITE=1 to pull with write access)" task "plugin:install_all_official" do skip = Set.new(%w[customer-flair poll]) - map = { "Canned Replies" => "https://github.com/discourse/discourse-canned-replies" } - STDERR.puts "Allowing write to all repos!" if ENV["GIT_WRITE"] Plugin::Metadata::OFFICIAL_PLUGINS.each do |name| next if skip.include? name - repo = map[name] || "https://github.com/discourse/#{name}" + repo = "https://github.com/discourse/#{name}" dir = repo.split("/").last path = File.expand_path("plugins/" + dir) diff --git a/spec/lib/plugin/metadata_spec.rb b/spec/lib/plugin/metadata_spec.rb index 922e6b92c54..8117e4404ca 100644 --- a/spec/lib/plugin/metadata_spec.rb +++ b/spec/lib/plugin/metadata_spec.rb @@ -45,7 +45,6 @@ TEXT official("discourse-adplugin") official("discourse-akismet") official("discourse-cakeday") - official("Canned Replies") official("discourse-data-explorer") unofficial("babble") end