Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit efd9ca3

Browse files
authored
Merge branch 'master' into bugfix/doctor_jekyll_reports_conflicts
2 parents f44c468 + 8f1d81a commit efd9ca3

File tree

104 files changed

+1173
-561
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+1173
-561
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ jobs:
1717
with:
1818
ruby-version: 2.6
1919
- name: Install mdl gem
20-
run: gem install mdl -v '0.7.0'
20+
run: gem install mdl
2121
- name: Run mdl
2222
run: mdl --style=_checks/styles/style-rules-prod --ignore-front-matter --git-recurse -- .

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ gem 'wdm', platform: :mswin
1111

1212
group :test do
1313
gem 'html-proofer'
14-
gem 'mdl', '= 0.7.0'
14+
gem 'mdl'
1515
gem 'launchy'
1616
end
1717

Gemfile.lock

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ GEM
1616
algoliasearch (1.27.2)
1717
httpclient (~> 2.8, >= 2.8.3)
1818
json (>= 1.5.1)
19+
chef-utils (16.4.41)
1920
colorator (1.1.0)
2021
concurrent-ruby (1.1.6)
2122
em-websocket (0.5.1)
@@ -106,16 +107,19 @@ GEM
106107
listen (3.2.1)
107108
rb-fsevent (~> 0.10, >= 0.10.3)
108109
rb-inotify (~> 0.9, >= 0.9.10)
109-
mdl (0.7.0)
110-
kramdown (~> 2.0)
111-
kramdown-parser-gfm (~> 1.0)
110+
mdl (0.11.0)
111+
kramdown (~> 2.3)
112+
kramdown-parser-gfm (~> 1.1)
112113
mixlib-cli (~> 2.1, >= 2.1.1)
113114
mixlib-config (>= 2.2.1, < 4)
115+
mixlib-shellout
114116
mercenary (0.4.0)
115117
mini_portile2 (2.4.0)
116-
mixlib-cli (2.1.6)
117-
mixlib-config (3.0.6)
118+
mixlib-cli (2.1.8)
119+
mixlib-config (3.0.9)
118120
tomlrb
121+
mixlib-shellout (3.1.4)
122+
chef-utils
119123
multipart-post (2.1.1)
120124
netrc (0.11.0)
121125
nokogiri (1.10.9)
@@ -178,7 +182,7 @@ DEPENDENCIES
178182
jekyll-sitemap
179183
jekyll-titles-from-headings
180184
launchy
181-
mdl (= 0.7.0)
185+
mdl
182186
rake
183187
wdm
184188
whatsup_github

Rakefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ require 'colorator'
1717
# Require helper methods from the 'lib' directory
1818
Dir.glob('lib/**/*.rb') { |file| require_relative(file) }
1919

20+
# Instantiate Docfile data for usage in tasks
21+
@content_map = DocConfig.new.content_map
22+
2023
desc "Same as 'rake', 'rake preview'"
2124
task default: %w[preview]
2225

_checks/styles/style-rules-prod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ rule 'MD038' # Spaces inside code span elements
3535
exclude_rule 'MD039'
3636
rule 'MD040' # Fenced code blocks should have a language specified
3737
exclude_rule 'MD041'
38-
exclude_rule 'MD046'
38+
rule 'MD046'

rakelib/multirepo.rake

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,15 @@ namespace :multirepo do
77
desc 'Create a file tree for devdocs website and get all required content'
88
task :init do
99
protocol = ENV['token'] ? "https://#{ENV['token']}@github.com/" : '[email protected]:'
10-
content_map = DocConfig.new.content_map
11-
content_map.each do |subrepo|
10+
@content_map.each do |subrepo|
1211
repo_url = protocol + subrepo['repository'] + '.git'
1312
add_subrepo(subrepo['directory'], repo_url , subrepo['branch'], subrepo['filter'])
1413
end
1514
end
1615

1716
desc 'Reinitialize subrepositories. CAUTION: This will remove directories and associated git repositories listed in Docfile'
1817
task reinit: %w[clean] do
19-
content_map = DocConfig.new.content_map
20-
content_map.each do |subrepo|
18+
@content_map.each do |subrepo|
2119
if subrepo['directory']
2220
puts "Removing #{subrepo['directory']}".yellow
2321
sh 'rm', '-rf', subrepo['directory']

rakelib/update.rake

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,21 @@ namespace :update do
4949
task all: %w[devdocs subrepos]
5050

5151
desc 'Update subrepositories only'
52-
task subrepos: %w[mbi pb pbm mftf]
52+
task :subrepos do
53+
@content_map.each do |subrepo|
54+
update_dir subrepo['directory']
55+
end
56+
end
5357
end
5458

5559
def update_dir(dir)
5660
abort "Cannot find the #{dir} directory. You can run 'rake init' to create it and rerun 'rake update:all' again.".red unless Dir.exist? dir
5761
Dir.chdir dir do
62+
puts "Updating #{dir}:".magenta
63+
64+
next warn "No branch to update" if `git status -sb`.include? 'no branch'
5865
sh 'git remote -v'
59-
sh 'git pull'
66+
sh 'git pull --no-recurse-submodules'
6067
sh 'git status -sb'
6168
end
6269
end

src/_data/main-nav.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
versionless: true
3939

4040
- label: Configure Application
41-
url: /cloud/project/project-conf-files_magento-app.html
41+
url: /cloud/project/magento-app.html
4242
versionless: true
4343

4444
- label: Configure Environments

src/_data/mde.yml

Lines changed: 64 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ extensions:
211211
name: Product Recommendations
212212
versions:
213213
-
214-
name: 3.0.4+
214+
name: 3.0.6
215215
support:
216216
2.3.0: supported
217217
2.3.1: supported
@@ -220,25 +220,76 @@ extensions:
220220
2.3.4: supported
221221
2.3.5-p1: supported
222222
2.4.0: supported
223+
-
224+
name: 3.0.5
225+
support:
226+
2.3.0: compatible
227+
2.3.1: compatible
228+
2.3.2: compatible
229+
2.3.3: compatible
230+
2.3.4: compatible
231+
2.3.5-p1: compatible
232+
2.4.0: compatible
233+
-
234+
name: 3.0.4
235+
support:
236+
2.3.0: compatible
237+
2.3.1: compatible
238+
2.3.2: compatible
239+
2.3.3: compatible
240+
2.3.4: compatible
241+
2.3.5-p1: compatible
242+
2.4.0: compatible
243+
-
244+
name: 3.0.3
245+
support:
246+
2.3.0: compatible
247+
2.3.1: compatible
248+
2.3.2: compatible
249+
2.3.3: compatible
250+
2.3.4: compatible
251+
2.3.5-p1: compatible
252+
2.4.0: compatible
253+
254+
-
255+
name: 3.0.2
256+
support:
257+
2.3.0: compatible
258+
2.3.1: compatible
259+
2.3.2: compatible
260+
2.3.3: compatible
261+
2.3.4: compatible
262+
2.3.5-p1: compatible
263+
2.4.0: compatible
264+
-
265+
name: 3.0.1
266+
support:
267+
2.3.0: compatible
268+
2.3.1: compatible
269+
2.3.2: compatible
270+
2.3.3: compatible
271+
2.3.4: compatible
272+
2.3.5-p1: compatible
273+
2.4.0: compatible
223274
-
224275
name: 3.0.0
225276
support:
226-
2.3.0: supported
227-
2.3.1: supported
228-
2.3.2: supported
229-
2.3.3: supported
230-
2.3.4: supported
231-
2.3.5-p1: supported
277+
2.3.0: compatible
278+
2.3.1: compatible
279+
2.3.2: compatible
280+
2.3.3: compatible
281+
2.3.4: compatible
282+
2.3.5-p1: compatible
232283
2.4.0: not supported
233284
-
234285
name: 2.0.0
235286
support:
236-
2.3.0: supported
237-
2.3.1: supported
238-
2.3.2: supported
239-
2.3.3: supported
240-
2.3.4: supported
241-
2.3.5-p1: supported
287+
2.3.0: compatible
288+
2.3.1: compatible
289+
2.3.2: compatible
290+
2.3.3: compatible
291+
2.3.4: compatible
292+
2.3.5-p1: compatible
242293
2.4.0: not supported
243294
-
244295
name: 1.x.x

src/_data/toc/cloud-guide.yml

Lines changed: 62 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,10 @@ pages:
114114
url: /cloud/project/project-webint-snap.html
115115
versionless: true
116116

117+
- label: Restore an environment
118+
url: /cloud/env/restore-environment.html
119+
versionless: true
120+
117121
- label: Profile database queries
118122
url: /cloud/project/profile-database-queries.html
119123
versionless: true
@@ -356,9 +360,25 @@ pages:
356360
versionless: true
357361
children:
358362
- label: Application
359-
url: /cloud/project/project-conf-files_magento-app.html
363+
url: /cloud/project/magento-app.html
360364
versionless: true
361365
children:
366+
- label: Properties
367+
url: /cloud/project/magento-app-properties.html
368+
versionless: true
369+
370+
- label: Variables
371+
url: /cloud/project/magento-app-variables.html
372+
versionless: true
373+
374+
- label: PHP application
375+
url: /cloud/project/magento-app-php-application.html
376+
versionless: true
377+
378+
- label: Workers
379+
url: /cloud/project/magento-app-workers.html
380+
versionless: true
381+
362382
- label: Set cache for static files
363383
url: /cloud/project/set-cache.html
364384
versionless: true
@@ -376,40 +396,8 @@ pages:
376396
url: /cloud/env/log-handlers.html
377397
versionless: true
378398

379-
- label: Environment variables
380-
url: /cloud/env/variables-intro.html
381-
versionless: true
382-
children:
383-
- label: ADMIN variables
384-
url: /cloud/env/environment-vars_magento.html
385-
versionless: true
386-
387-
- label: Global variables
388-
url: /cloud/env/variables-global.html
389-
versionless: true
390-
391-
- label: Build variables
392-
url: /cloud/env/variables-build.html
393-
versionless: true
394-
395-
- label: Cloud variables
396-
url: /cloud/env/variables-cloud.html
397-
versionless: true
398-
399-
- label: Deploy variables
400-
url: /cloud/env/variables-deploy.html
401-
versionless: true
402-
403-
- label: Post-deploy variables
404-
url: /cloud/env/variables-post-deploy.html
405-
versionless: true
406-
407-
- label: Working with variables
408-
url: /cloud/env/working-with-variables.html
409-
versionless: true
410-
411399
- label: Routes
412-
url: /cloud/project/project-conf-files_routes.html
400+
url: /cloud/project/routes.html
413401
versionless: true
414402
children:
415403
- label: Caching
@@ -425,28 +413,61 @@ pages:
425413
versionless: true
426414

427415
- label: Services
428-
url: /cloud/project/project-conf-files_services.html
416+
url: /cloud/project/services.html
429417
versionless: true
430418
children:
431419
- label: Set up MySQL service
432-
url: /cloud/project/project-conf-files_services-mysql.html
420+
url: /cloud/project/services-mysql.html
433421
versionless: true
434422

435423
- label: Set up Redis service
436-
url: /cloud/project/project-conf-files_services-redis.html
424+
url: /cloud/project/services-redis.html
437425
versionless: true
438426

439427
- label: Set up Elasticsearch service
440-
url: /cloud/project/project-conf-files_services-elastic.html
428+
url: /cloud/project/services-elastic.html
441429
versionless: true
442430

443431
- label: Set up RabbitMQ service
444-
url: /cloud/project/project-conf-files_services-rabbit.html
432+
url: /cloud/project/services-rabbit.html
445433
versionless: true
446434

447-
- label: Restore an environment
448-
url: /cloud/env/restore-environment.html
435+
- label: PHP (php.ini)
436+
url: /cloud/project/magento-app-php-ini.html
437+
versionless: true
438+
439+
- label: Environment variables
440+
url: /cloud/env/variables-intro.html
449441
versionless: true
442+
children:
443+
- label: ADMIN variables
444+
url: /cloud/env/environment-vars_magento.html
445+
versionless: true
446+
447+
- label: Global variables
448+
url: /cloud/env/variables-global.html
449+
versionless: true
450+
451+
- label: Build variables
452+
url: /cloud/env/variables-build.html
453+
versionless: true
454+
455+
- label: Cloud variables
456+
url: /cloud/env/variables-cloud.html
457+
versionless: true
458+
459+
- label: Deploy variables
460+
url: /cloud/env/variables-deploy.html
461+
versionless: true
462+
463+
- label: Post-deploy variables
464+
url: /cloud/env/variables-post-deploy.html
465+
versionless: true
466+
467+
- label: Working with variables
468+
url: /cloud/env/working-with-variables.html
469+
versionless: true
470+
450471

451472
- label: Configuration management for store settings
452473
url: /cloud/live/sens-data-over.html

0 commit comments

Comments
 (0)