Merge

.editorconfig

@@ -1,13 +1,49 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
 # editorconfig.org
+
+; top-most EditorConfig file
 root = true
 
+; define basic and global for any file
 [*]
-indent_style = space
-indent_size = 4
-end_of_line = lf
 charset = utf-8
-trim_trailing_whitespace = true
+end_of_line = lf
+indent_size = 4
+indent_style = space
 insert_final_newline = true
+max_line_length = off
+trim_trailing_whitespace = true
+curly_bracket_next_line = false
+spaces_around_operators = true
+
+; DOS/Windows batch scripts - 
+[*.{bat,cmd}]
+end_of_line = crlf
+
+; JavaScript files - 
+[*.{js,ts}]
+curly_bracket_next_line = true
+quote_type = single
+
+; JSON files (normal and commented version) - 
+[*.{json,jsonc}]
+indent_size = 2
+quote_type = double
 
-[*.md]
+; Make - match it own default syntax
+[Makefile]
+indent_style = tab
+
+; Markdown files - preserve trail spaces that means break line
+[*.{md,markdown}]
 trim_trailing_whitespace = false
+
+; PowerShell - match defaults for New-ModuleManifest and PSScriptAnalyzer Invoke-Formatter
+[*.{ps1,psd1,psm1}]
+charset = utf-8-bom
+end_of_line = crlf
+
+; YML config files - match it own default syntax
+[*.{yaml,yml}]
+indent_size = 2

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,7 +2,7 @@
 Add resource(s) | Remove resource(s) | Add info | Improve repo
 
 ## For resources
-### Description 
+### Description
 
 ### Why is this valuable (or not)?
 
@@ -11,12 +11,12 @@ Add resource(s) | Remove resource(s) | Add info | Improve repo
 ### For book lists, is it a book? For course lists, is it a course? etc.
 
 ## Checklist:
-- [ ] Read our [contributing guidelines](https://github.com/EbookFoundation/free-programming-books/blob/master/CONTRIBUTING.md)
+- [ ] Read our [contributing guidelines](https://github.com/EbookFoundation/free-programming-books/blob/main/docs/CONTRIBUTING.md)
 - [ ] Search for duplicates.
 - [ ] Include author(s) and platform where appropriate.
-- [ ] Put lists  in alphabetical order, correct spacing.
+- [ ] Put lists in alphabetical order, correct spacing.
 - [ ] Add needed indications (PDF, access notes, under construction)
 
-## Followup
+## Follow-up
 
-- Check the output of Travis-CI for linter errors!
+- Check the status of GitHub Actions and resolve any reported warnings!

.github/dependabot.yml

@@ -0,0 +1,37 @@
+# Github Dependabot config file
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    # Workflow files stored in the
+    # default location of `.github/workflows`
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "saturday"
+      time: "12:00"
+      timezone: "Europe/Paris"
+    # Specify labels for `gha` pull requests
+    labels:
+      - "🔗 dependencies"
+      - "🔗 dependencies:github-actions"
+      - "🤖 automation"
+    commit-message:
+      # Prefix all commit messages with `chore` (follow conventional-commits)
+      # include a list of updated dependencies
+      prefix: "chore"
+      include: "scope"
+    # Allow up to N open pull requests (0 to disable)
+    open-pull-requests-limit: 10
+    pull-request-branch-name:
+      # Separate sections of the branch name with a hyphen
+      # for example, `dependabot/github_actions/actions/checkout-2.3.1`
+      separator: "/"
+    # Add the arrays of assignees and reviewers
+    assignees:
+      - "EbookFoundation/maintainers"
+    reviewers:
+      - "EbookFoundation/reviewers"

.github/workflows/fpb-lint.yml

@@ -1,18 +1,18 @@
 name: free-programming-books-lint
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Use Node.js
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
-        node-version: '14.x'
+        node-version: '16.x'
     - run: npm install -g free-programming-books-lint
     - run: fpb-lint ./books/
     - run: fpb-lint ./casts/

.github/workflows/main.yml

@@ -4,16 +4,16 @@ jobs:
   job:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - uses: trilom/[email protected]
         id: file_changes
         with:
           output: ''
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.4.1
+          ruby-version: 2.6
       - run: gem install awesome_bot
       - run: for i in ${{ steps.file_changes.outputs.files_modified }}; do echo; echo "processing $i"; awesome_bot $i --allow-redirect --allow-dupe --allow-ssl || true; done
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           path: ${{ github.workspace }}/*.json