Skip to content

Commit

Permalink
Merge branch 'main' into gh-8501
Browse files Browse the repository at this point in the history
  • Loading branch information
cobaltt7 authored Nov 13, 2022
2 parents 0cfcacf + ff85481 commit 520cbb8
Show file tree
Hide file tree
Showing 149 changed files with 4,583 additions and 5,814 deletions.
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ body:
label: Which package is this bug report for?
options:
- discord.js
- brokers
- builders
- collection
- rest
Expand Down
3 changes: 3 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ apps:website:
- apps/website/*
- apps/website/**/*

packages:brokers:
- packages/brokers/*
- packages/brokers/**/*
packages:builders:
- packages/builders/*
- packages/builders/**/*
Expand Down
2 changes: 2 additions & 0 deletions .github/labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@
color: e4e669
- name: need repro
color: c66037
- name: packages:brokers
color: fbca04
- name: packages:builders
color: fbca04
- name: packages:collection
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,9 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: 16
cache: 'yarn'

- name: Install dependencies
run: yarn --immutable
uses: ./packages/actions/src/yarnCache

- name: Build dependencies
run: yarn build
Expand All @@ -68,7 +67,7 @@ jobs:
max-parallel: 1
fail-fast: false
matrix:
package: ['builders', 'collection', 'discord.js', 'proxy', 'rest', 'util', 'voice', 'ws']
package: ['brokers', 'builders', 'collection', 'discord.js', 'proxy', 'rest', 'util', 'voice', 'ws']
runs-on: ubuntu-latest
env:
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
Expand All @@ -81,10 +80,9 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: 16
cache: 'yarn'

- name: Install dependencies
run: yarn --immutable
uses: ./packages/actions/src/yarnCache

- name: Build actions
run: yarn workspace @discordjs/actions build
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/npm-auto-deprecate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,11 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: 16
cache: 'yarn'

- name: Install dependencies
run: yarn --immutable
uses: ./packages/actions/src/yarnCache

- name: Deprecate versions
run: 'yarn npm-deprecate --name "*dev*" --package @discordjs/builders @discordjs/collection discord.js @discordjs/proxy @discordjs/rest @discordjs/util @discordjs/voice @discordjs/ws'
run: 'yarn npm-deprecate --name "*dev*" --package @discordjs/brokers @discordjs/builders @discordjs/collection discord.js @discordjs/proxy @discordjs/rest @discordjs/util @discordjs/voice @discordjs/ws'
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
5 changes: 3 additions & 2 deletions .github/workflows/publish-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ jobs:
fail-fast: false
matrix:
include:
- package: '@discordjs/brokers'
folder: 'brokers'
- package: '@discordjs/builders'
folder: 'builders'
- package: '@discordjs/collection'
Expand Down Expand Up @@ -40,10 +42,9 @@ jobs:
with:
node-version: 16
registry-url: https://registry.npmjs.org/
cache: 'yarn'

- name: Install dependencies
run: yarn --immutable
uses: ./packages/actions/src/yarnCache

- name: Build dependencies
run: yarn build
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,15 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: 16
cache: 'yarn'

- name: Install dependencies
run: yarn install --immutable
uses: ./packages/actions/src/yarnCache

- name: Build dependencies
run: yarn build

- name: ESLint
run: yarn lint
run: yarn lint -- --format=compact

- name: Tests
run: yarn test
Expand Down
Loading

0 comments on commit 520cbb8

Please sign in to comment.