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
6767 2. 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.
6868 3. 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.
6969 4. If `self.links` is defined, check if the urls are still correct.
70−5. Generate the docs using `thor docs:generate <doc@version>`.
71−6. 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.
72−7. Repeat steps 5 and 6 for all versions that you updated.
73−8. Create a PR and make sure to fill the checklist in section B of the PR template (remove the other sections).
70+5. 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.
71+6. Generate the docs using `thor docs:generate <doc@version>`.
72+7. 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.
73+8. Repeat steps 5 and 6 for all versions that you updated.
74+9. Create a PR and make sure to fill the checklist in section B of the PR template (remove the other sections).
7475
7576 ## Coding conventions
7677
.github/workflows/build.yml+1−1
@@ -13,7 +13,7 @@ jobs: · 12 unmodified lines
1313 steps:
1414 - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.0
1515 - name: Set up Ruby
16− uses: ruby/setup-ruby@03b78bdda287ae04217ee12e4b64996630a03542 # v1.131.0
16+ uses: ruby/setup-ruby@09c10210cc6e998d842ce8433cd9d245933cd797 # v1.133.0
1717 with:
1818 bundler-cache: true # runs 'bundle install' and caches installed gems automatically
1919 - name: Run tests
.github/workflows/schedule-doc-report.yml+1−1
@@ -10,7 +10,7 @@ jobs: · 9 unmodified lines
1010 steps:
1111 - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.0
1212 - name: Set up Ruby
13− uses: ruby/setup-ruby@03b78bdda287ae04217ee12e4b64996630a03542 # v1.131.0
13+ uses: ruby/setup-ruby@09c10210cc6e998d842ce8433cd9d245933cd797 # v1.133.0
1414 with:
1515 bundler-cache: true # runs 'bundle install' and caches installed gems automatically
1616 - name: Generate report
.github/workflows/test.yml+1−1
@@ -11,7 +11,7 @@ jobs: · 10 unmodified lines
1111 steps:
1212 - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.0
1313 - name: Set up Ruby
14− uses: ruby/setup-ruby@03b78bdda287ae04217ee12e4b64996630a03542 # v1.131.0
14+ uses: ruby/setup-ruby@09c10210cc6e998d842ce8433cd9d245933cd797 # v1.133.0
1515 with:
1616 bundler-cache: true # runs 'bundle install' and caches installed gems automatically
1717 - name: Run tests