Merge branch 'mochajs:main' into spec-reporter-retries

.github/CODE_OF_CONDUCT.md

@@ -100,4 +100,4 @@ This is a foundation-wide team established to manage escalation when a reporter
 In order to escalate to the CoCP send an email to `"[email protected]`.
 
 For more information, refer to the full
-[Code of Conduct governance document](https://github.com/openjs-foundation/cross-project-council/blob/master/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md).
+[Code of Conduct governance document](https://github.com/openjs-foundation/cross-project-council/tree/main/proposals/approved/CODE_OF_CONDUCT).

.github/CONTRIBUTING.md

@@ -99,11 +99,11 @@ Then:
    - Add detail in subsequent lines.
    - A pre-commit hook will run which automatically formats your staged changes (and fixes any problems it can) with ESLint and Prettier.
      If ESLint fails to fix an issue, your commit will fail and you will need to manually correct the problem.
-1. <a name="up-to-date"/> (Optional) Ensure you are up-to-date with Mocha's `master` branch:
+1. <a name="up-to-date"/> (Optional) Ensure you are up-to-date with Mocha's `main` branch:
    - You can add an "upstream" remote repo using `git remote add upstream https://github.com/mochajs/mocha.git && git fetch upstream`.
-   - Navigate to your `master` branch using `git checkout master`.
-   - Pull changes from `upstream` using `git pull upstream master`.
-   - If any changes were pulled in, update your branch from `master` by switching back to your branch (`git checkout <your-branch>`) then merging using `git merge master`.
+   - Navigate to your `main` branch using `git checkout main`.
+   - Pull changes from `upstream` using `git pull upstream main`.
+   - If any changes were pulled in, update your branch from `main` by switching back to your branch (`git checkout <your-branch>`) then merging using `git merge main`.
 1. Push your changes to your fork; `git push origin`.
 1. In your browser, navigate to [mochajs/mocha](https://github.com/mochajs/mocha).
    You should see a notification about your recent changes in your fork's branch, with a (green?) button to create a pull request.
@@ -126,7 +126,7 @@ Now that the pull request exists, some tasks will be run on it:
 1. Be patient while your PR is reviewed.
    This can take a while.
    We may request changes, but don't be afraid to question them.
-1. Your PR might become conflicted with the code in `master`.
+1. Your PR might become conflicted with the code in `main`.
    If this is the case, you will need to [update your PR](#up-to-date) and resolve your conflicts.
 1. You don't need to make a new PR to any needed changes.
    Instead, commit on top of your changes, and push these to your fork's branch.

.github/ISSUE_TEMPLATE/01-bug.yml

@@ -3,7 +3,7 @@ body:
       description: If any of these required steps are not taken, we may not be able to review your issue. Help us to help you!
       label: Bug Report Checklist
       options:
-        - label: I have read and agree to Mocha's [Code of Conduct](https://github.com/mochajs/mocha/blob/master/.github/CODE_OF_CONDUCT.md) and [Contributing Guidelines](https://github.com/mochajs/mocha/blob/master/.github/CONTRIBUTING.md)
+        - label: I have read and agree to Mocha's [Code of Conduct](https://github.com/mochajs/mocha/blob/main/.github/CODE_OF_CONDUCT.md) and [Contributing Guidelines](https://github.com/mochajs/mocha/blob/main/.github/CONTRIBUTING.md)
           required: true
         - label: I have searched for [related issues](https://github.com/mochajs/mocha/issues?q=is%3Aissue) and [issues with the `faq` label](https://github.com/mochajs/mocha/issues?utf8=%E2%9C%93&q=is%3Aissue%20label%3Afaq%20), but none matched my issue.
           required: true

.github/ISSUE_TEMPLATE/02-documentation.yml

@@ -3,7 +3,7 @@ body:
       description: If any of these required steps are not taken, we may not be able to review your issue. Help us to help you!
       label: Documentation Request Checklist
       options:
-        - label: I have read and agree to Mocha's [Code of Conduct](https://github.com/mochajs/mocha/blob/master/.github/CODE_OF_CONDUCT.md) and [Contributing Guidelines](https://github.com/mochajs/mocha/blob/master/.github/CONTRIBUTING.md)
+        - label: I have read and agree to Mocha's [Code of Conduct](https://github.com/mochajs/mocha/blob/main/.github/CODE_OF_CONDUCT.md) and [Contributing Guidelines](https://github.com/mochajs/mocha/blob/main/.github/CONTRIBUTING.md)
           required: true
         - label: I have searched for [related issues](https://github.com/mochajs/mocha/issues?q=is%3Aissue) and [issues with the `faq` label](https://github.com/mochajs/mocha/issues?utf8=%E2%9C%93&q=is%3Aissue%20label%3Afaq%20), but none matched my issue.
           required: true

.github/ISSUE_TEMPLATE/03-feature-request.yml

@@ -3,7 +3,7 @@ body:
       description: If any of these required steps are not taken, we may not be able to review your issue. Help us to help you!
       label: Feature Request Checklist
       options:
-        - label: I have read and agree to Mocha's [Code of Conduct](https://github.com/mochajs/mocha/blob/master/.github/CODE_OF_CONDUCT.md) and [Contributing Guidelines](https://github.com/mochajs/mocha/blob/master/.github/CONTRIBUTING.md)
+        - label: I have read and agree to Mocha's [Code of Conduct](https://github.com/mochajs/mocha/blob/main/.github/CODE_OF_CONDUCT.md) and [Contributing Guidelines](https://github.com/mochajs/mocha/blob/main/.github/CONTRIBUTING.md)
           required: true
         - label: I have searched for [related issues](https://github.com/mochajs/mocha/issues?q=is%3Aissue) and [issues with the `faq` label](https://github.com/mochajs/mocha/issues?utf8=%E2%9C%93&q=is%3Aissue%20label%3Afaq%20), but none matched my issue.
           required: true

.github/ISSUE_TEMPLATE/04-repository-tooling.yml

@@ -5,9 +5,9 @@ body:
       options:
         - label: I have tried restarting my IDE and the issue persists.
           required: true
-        - label: I have pulled the latest `master` branch of the repository.
+        - label: I have pulled the latest `main` branch of the repository.
           required: true
-        - label: I have read and agree to Mocha's [Code of Conduct](https://github.com/mochajs/mocha/blob/master/.github/CODE_OF_CONDUCT.md) and [Contributing Guidelines](https://github.com/mochajs/mocha/blob/master/.github/CONTRIBUTING.md)
+        - label: I have read and agree to Mocha's [Code of Conduct](https://github.com/mochajs/mocha/blob/main/.github/CODE_OF_CONDUCT.md) and [Contributing Guidelines](https://github.com/mochajs/mocha/blob/main/.github/CONTRIBUTING.md)
           required: true
         - label: I have searched for [related issues](https://github.com/mochajs/mocha/issues?q=is%3Aissue) and [issues with the `faq` label](https://github.com/mochajs/mocha/issues?utf8=%E2%9C%93&q=is%3Aissue%20label%3Afaq%20), but none matched my issue.
           required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,4 @@
-blank_issues_enabled: false
+blank_issues_enabled: true
 contact_links:
   - name: Documentation Website
     about: Please read our documentation website before filing new issues.

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,7 +6,7 @@ Otherwise we may not be able to review your PR. -->
 
 - [ ] Addresses an existing open issue: fixes #000
 - [ ] That issue was marked as [`status: accepting prs`](https://github.com/mochajs/mocha/issues?q=is%3Aopen+is%3Aissue+label%3A%22status%3A+accepting+prs%22)
-- [ ] Steps in [CONTRIBUTING.md](https://github.com/mochajs/mocha/blob/master/.github/CONTRIBUTING.md) were taken
+- [ ] Steps in [CONTRIBUTING.md](https://github.com/mochajs/mocha/blob/main/.github/CONTRIBUTING.md) were taken
 
 ## Overview
 

.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'weekly'
+    groups:
+      github-actions:
+        patterns:
+          - '*'

.github/workflows/browser-test.yml

@@ -20,7 +20,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
           persist-credentials: false
       - name: 'Cache node_modules'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: '~/.npm'
           key: "ubuntu-latest-node-full-lts-${{ hashFiles('**/package-lock.json') }}"
@@ -32,7 +32,7 @@ jobs:
           SAUCE_USERNAME: '${{secrets.SAUCE_USERNAME}}'
           SAUCE_ACCESS_KEY: '${{secrets.SAUCE_ACCESS_KEY}}'
       - name: remove 'run-browser-test' label
-        uses: buildsville/[email protected].0
+        uses: buildsville/[email protected].1
         if: ${{ always() }}
         with:
           token: ${{secrets.GITHUB_TOKEN}}

.github/workflows/compliance.yml

@@ -12,7 +12,7 @@ name: Compliance
 on:
   pull_request:
     branches:
-      - master
+      - main
     types:
       - edited
       - opened

.github/workflows/mocha.yml

@@ -70,7 +70,7 @@ jobs:
         with:
           persist-credentials: false
       - name: 'Cache node_modules'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: '~/.npm'
           key: "ubuntu-latest-node-lts-${{ hashFiles('**/package-lock.json') }}"
@@ -113,7 +113,7 @@ jobs:
         run: |
           echo "dir=$(npm config get cache)" >> $env:GITHUB_OUTPUT
       - name: 'Cache node_modules'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ matrix.os == 'ubuntu-latest' && '~/.npm' || steps.npm-cache.outputs.dir }}
           key: "${{ matrix.os }}-node-v${{ matrix.node }}-${{ hashFiles('**/package-lock.json') }}"
@@ -152,7 +152,7 @@ jobs:
         with:
           persist-credentials: false
       - name: 'Cache node_modules'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: '~/.npm'
           # this key is different than above, since we are running scripts
@@ -189,7 +189,7 @@ jobs:
         with:
           persist-credentials: false
       - name: 'Cache node_modules'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: '~/.npm'
           # this key is different than above, since we are running scripts

AUTHORS

@@ -547,5 +547,19 @@ Aras Abbasi <[email protected]>
 Spencer <[email protected]>
 Feng Yu <[email protected]>
 Pelle Wessman <[email protected]>
+Orgad Shaneh <[email protected]>
+Lucas Lopes <[email protected]>
+Bryan Mishkin <[email protected]>
+Ville Lahdenvuo <[email protected]>
+Nathan Phillip Brink <[email protected]>
+Ståle Tomten <[email protected]>
+dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
+Sleepy Flower <[email protected]>
+StevenMia <[email protected]>
+Simon Hanna <[email protected]>
+Ilia Choly <[email protected]>
+Marjorie Saito <[email protected]>
+Khoa Huynh <[email protected]>
+Sam Adams <[email protected]>
 
 # Generated by scripts/update-authors.js