Remove .delete_me files for deprecated client apps
We had to manually add these two empty files to deprecated client app folders in /client_apps/* as an indicator to a Rails initializer that these client apps are now obsolete and need to removed BEFORE the JS rake task runs. Otherwise, the rake task would fail trying to build those client apps unless the initializer removed the folders. Problem is, without this patch, anytime somebody runs `rake canvas:compile_assets` or the JS rake tasks, their git HEAD will be dirty with the now-removed .delete_me files. This patch removes the files from the git history. Closes CNVS-17516 TEST PLAN ---- ---- - run `bundle exec rake canvas:compile_assets` + verify it works - run `git status` and make sure it does not list files in `/client_apps/canvas_quiz_*/.delete_me/` - browse the client_apps folder (`ls client_apps/*`) and verify neither canvas_quiz_statistics nor canvas_quiz_inspector exist Change-Id: I0ab23ff6200e2425e0b3e104b2cdfd08e6a11629 Reviewed-on: https://gerrit.instructure.com/45813 Reviewed-by: Simon Williams <simon@instructure.com> Tested-by: Jenkins <jenkins@instructure.com> QA-Review: Derek DeVries <ddevries@instructure.com> Product-Review: Derek DeVries <ddevries@instructure.com>
This commit is contained in:
parent
e267f6ab59
commit
aad33184d0
|
@ -7,21 +7,6 @@ def maintain_client_app_symlinks
|
|||
end
|
||||
end
|
||||
|
||||
# remove stale apps that were migrated/rewritten and have left build artifacts
|
||||
# and such after being removed from git (stuff was gitignored)
|
||||
#
|
||||
# needed since https://gerrit.instructure.com/#/c/44576
|
||||
Dir.glob("client_apps/*/.delete_me").each do |file|
|
||||
app = file.split('/')[1]
|
||||
|
||||
FileUtils.rm_rf(File.dirname(file))
|
||||
|
||||
[ "#{app}", "#{app}.js" ].each do |asset|
|
||||
asset_symlink = "public/javascripts/client_apps/#{asset}"
|
||||
FileUtils.rm(asset_symlink) if File.exists?(asset_symlink)
|
||||
end
|
||||
end
|
||||
|
||||
# create new ones
|
||||
Dir.glob("client_apps/*").select { |f| File.directory?(f) }.each do |app_dir|
|
||||
unless File.exists?("public/javascripts/client_apps")
|
||||
|
|
|
@ -20,7 +20,6 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
|
|||
|
||||
describe Quizzes::QuizSubmissionEventsController do
|
||||
before :once do
|
||||
Account.default.enable_feature!(:draft_state)
|
||||
Account.default.enable_feature!(:quiz_log_auditing)
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue