Skip to content

Commit

Permalink
Merge branch 'master' into issues/4552
Browse files Browse the repository at this point in the history
  • Loading branch information
sam-super authored Apr 5, 2024
2 parents 4013a93 + e263c7a commit e3b3413
Show file tree
Hide file tree
Showing 36 changed files with 3,181 additions and 2,150 deletions.
14 changes: 0 additions & 14 deletions .eslintignore

This file was deleted.

102 changes: 0 additions & 102 deletions .eslintrc.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ Then:

### 🎋 Initial Creation

1. Make sure the issue is labeled with [`status: accepting prs`](https://github.com/mochajs/mocha/issues?q=is%3Aissue+is%3Aopen+label%3A%22status%3A+accepting+prs%22)
1. Create a new branch in your working copy.
Give your branch a descriptive name, such as `issue/12345`: `git checkout -b issue/12345`.
1. Make your changes and add them via `git add`.
- Your changes will likely be somewhere in `lib/`, `bin/` or `browser-entry.js` (if your changes are browser-specific).
- Your changes will likely be somewhere in `lib/`, `bin/`, or (if your changes are browser-specific) `browser-entry.js`.
- Unit and/or integration **tests are required** for any code change.
These live in `test/`.
- **Do not modify** the root `mocha.js` file directly; it is automatically generated.
Expand Down
5 changes: 3 additions & 2 deletions .github/ISSUE_TEMPLATE/01-bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ body:
type: textarea
description: Report a bug trying to run the code
labels:
- "type: bug"
- 'status: in triage'
- 'type: bug'
name: 🐛 Bug
title: "🐛 Bug: <short description of the bug>"
title: '🐛 Bug: <short description of the bug>'
5 changes: 3 additions & 2 deletions .github/ISSUE_TEMPLATE/02-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ body:
type: textarea
description: Report a typo or missing area of documentation
labels:
- "area: documentation"
- 'area: documentation'
- 'status: in triage'
name: 📝 Docs
title: "📝 Docs: <short description of the request>"
title: '📝 Docs: <short description of the request>'
5 changes: 3 additions & 2 deletions .github/ISSUE_TEMPLATE/03-feature-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ body:
type: textarea
description: Request that a new feature be added or an existing feature improved
labels:
- "type: feature"
- 'status: in triage'
- 'type: feature'
name: 🚀 Feature
title: "🚀 Feature: <short description of the feature>"
title: '🚀 Feature: <short description of the feature>'
5 changes: 3 additions & 2 deletions .github/ISSUE_TEMPLATE/04-repository-tooling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ body:
type: textarea
description: Report a bug or request an enhancement in the Mocha repository's internal tooling
labels:
- "area: repository tooling"
- 'area: repository tooling'
- 'status: in triage'
name: 🛠 Repository Tooling
title: "🛠 Repo: <short description of the change>"
title: '🛠 Repo: <short description of the change>'
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/main/.github/CONTRIBUTING.md) were taken
- [ ] Steps in [CONTRIBUTING.md](https://github.com/mochajs/mocha/blob/master/.github/CONTRIBUTING.md) were taken

## Overview

Expand Down
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: 2
updates:
- package-ecosystem: 'github-actions'
directory: '/'
schedule:
interval: 'weekly'
groups:
github-actions:
patterns:
- '*'
4 changes: 2 additions & 2 deletions .github/workflows/browser-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}"
Expand All @@ -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}}
Expand Down
16 changes: 16 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
- run: npm install --ignore-scripts
- run: npm run lint

name: CI

on:
pull_request: ~
push:
branches:
- main
23 changes: 23 additions & 0 deletions .github/workflows/compliance.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
jobs:
compliance:
runs-on: ubuntu-latest
steps:
- uses: mtfoley/pr-compliance-action@main
with:
body-auto-close: false
ignore-team-members: false

name: Compliance

on:
pull_request:
branches:
- master
types:
- edited
- opened
- reopened
- synchronize

permissions:
pull-requests: write
8 changes: 4 additions & 4 deletions .github/workflows/mocha.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}"
Expand Down Expand Up @@ -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') }}"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 12 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -542,5 +542,17 @@ Josh Goldberg <[email protected]>
Kleis Auke Wolthuizen <[email protected]>
Paulo Gonçalves <[email protected]>
Anton Usmansky <[email protected]>
jb2311 <[email protected]>
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>

# Generated by scripts/update-authors.js
Loading

0 comments on commit e3b3413

Please sign in to comment.