History

Merge branch 'freeCodeCamp:main' into patch-1

Alexandre ZANNI committed 3 years ago

Commit 8f794372 parents bb6c49a 30c68534 files · +8 −7Browse files

Unified · Split

4 files
  1. .github/CONTRIBUTING.md +5 −4
  2. .github/workflows/build.yml +1 −1
  3. .github/workflows/schedule-doc-report.yml +1 −1
  4. .github/workflows/test.yml +1 −1
.github/CONTRIBUTING.md+5−4
@@ -67,10 +67,11 @@ Follow the following steps to update documentations to their latest version: · 66 unmodified lines
672. Check if the license is still correct. If you update `options[:attribution]`, also update the documentation's entry in the array in [`assets/javascripts/templates/pages/about_tmpl.coffee`](../assets/javascripts/templates/pages/about_tmpl.coffee) to match.672. Check if the license is still correct. If you update `options[:attribution]`, also update the documentation's entry in the array in [`assets/javascripts/templates/pages/about_tmpl.coffee`](../assets/javascripts/templates/pages/about_tmpl.coffee) to match.
683. If the documentation has a custom icon, ensure the icons in <code>public/icons/*your_scraper_name*/</code> are up-to-date. If you pull the updated icon from a place different than the one specified in the `SOURCE` file, make sure to replace the old link with the new one.683. If the documentation has a custom icon, ensure the icons in <code>public/icons/*your_scraper_name*/</code> are up-to-date. If you pull the updated icon from a place different than the one specified in the `SOURCE` file, make sure to replace the old link with the new one.
694. If `self.links` is defined, check if the urls are still correct.694. If `self.links` is defined, check if the urls are still correct.
705. Generate the docs using `thor docs:generate <doc@version>`.705. If the scraper inherits from `FileScraper` rather than `URLScraper`, follow the instructions for that scraper in [`file-scrapers.md`](../docs/file-scrapers.md) to obtain the source material for the scraper.
716. Make sure `thor docs:generate` doesn't show errors and that the documentation still works well. Verify locally that everything works and that the categorization of entries is still good. Often, updates will require code changes in the scraper or its filters to tweak some new markup in the source website or to categorize new entries.716. Generate the docs using `thor docs:generate <doc@version>`.
727. Repeat steps 5 and 6 for all versions that you updated.727. Make sure `thor docs:generate` doesn't show errors and that the documentation still works well. Verify locally that everything works and that the categorization of entries is still good. Often, updates will require code changes in the scraper or its filters to tweak some new markup in the source website or to categorize new entries.
738. Create a PR and make sure to fill the checklist in section B of the PR template (remove the other sections).738. Repeat steps 5 and 6 for all versions that you updated.
749. Create a PR and make sure to fill the checklist in section B of the PR template (remove the other sections).
74 75
75## Coding conventions76## Coding conventions
76 77
.github/workflows/build.yml+1−1
@@ -13,7 +13,7 @@ jobs: · 12 unmodified lines
13 steps:13 steps:
14 - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.014 - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.0
15 - name: Set up Ruby15 - name: Set up Ruby
16 uses: ruby/setup-ruby@03b78bdda287ae04217ee12e4b64996630a03542 # v1.131.016 uses: ruby/setup-ruby@09c10210cc6e998d842ce8433cd9d245933cd797 # v1.133.0
17 with:17 with:
18 bundler-cache: true # runs 'bundle install' and caches installed gems automatically18 bundler-cache: true # runs 'bundle install' and caches installed gems automatically
19 - name: Run tests19 - name: Run tests
.github/workflows/schedule-doc-report.yml+1−1
@@ -10,7 +10,7 @@ jobs: · 9 unmodified lines
10 steps:10 steps:
11 - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.011 - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.0
12 - name: Set up Ruby12 - name: Set up Ruby
13 uses: ruby/setup-ruby@03b78bdda287ae04217ee12e4b64996630a03542 # v1.131.013 uses: ruby/setup-ruby@09c10210cc6e998d842ce8433cd9d245933cd797 # v1.133.0
14 with:14 with:
15 bundler-cache: true # runs 'bundle install' and caches installed gems automatically15 bundler-cache: true # runs 'bundle install' and caches installed gems automatically
16 - name: Generate report16 - name: Generate report
.github/workflows/test.yml+1−1
@@ -11,7 +11,7 @@ jobs: · 10 unmodified lines
11 steps:11 steps:
12 - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.012 - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.0
13 - name: Set up Ruby13 - name: Set up Ruby
14 uses: ruby/setup-ruby@03b78bdda287ae04217ee12e4b64996630a03542 # v1.131.014 uses: ruby/setup-ruby@09c10210cc6e998d842ce8433cd9d245933cd797 # v1.133.0
15 with:15 with:
16 bundler-cache: true # runs 'bundle install' and caches installed gems automatically16 bundler-cache: true # runs 'bundle install' and caches installed gems automatically
17 - name: Run tests17 - name: Run tests