Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync to upstream #3

Open
wants to merge 110 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
52b783c
chore(deps): update dependency express-rate-limit to v6.10.0 (#962)
renovate[bot] Aug 31, 2023
52feaae
chore(deps): lock file maintenance (#963)
renovate[bot] Aug 31, 2023
00ecbf6
chore(deps): update dependency @types/node to v18.17.13 (#964)
renovate[bot] Sep 1, 2023
47e1a90
chore(deps): update dependency @types/node to v18.17.14 (#965)
renovate[bot] Sep 2, 2023
6d8533e
chore(deps): update actions/checkout action to v4 (#966)
renovate[bot] Sep 4, 2023
66fdfc9
chore(deps): update dependency ws to v8.14.0 (#968)
renovate[bot] Sep 7, 2023
28d14e0
chore(deps): update dependency express-rate-limit to v6.11.0 (#967)
renovate[bot] Sep 7, 2023
4980835
chore(deps): update docker/build-push-action digest to 4e4ee68 (#969)
renovate[bot] Sep 8, 2023
bc6c3e6
chore(deps): update docker/build-push-action digest to 0a97817 (#970)
renovate[bot] Sep 8, 2023
ad5c090
chore(deps): update dependency ws to v8.14.1 (#971)
renovate[bot] Sep 8, 2023
4da20c9
chore(deps): update dependency @types/node to v18.17.15 (#972)
renovate[bot] Sep 8, 2023
4902f21
chore(deps): update dependency eslint to v8.49.0 (#973)
renovate[bot] Sep 9, 2023
1bea42a
chore(deps): update mongoose (#960)
renovate[bot] Sep 10, 2023
1a156ae
chore(deps): update dependency express-rate-limit to v6.11.1 (#974)
renovate[bot] Sep 10, 2023
023416d
chore(deps): update dependency mongoose to v7.5.1 (#975)
renovate[bot] Sep 11, 2023
45b441d
chore(deps): update dependency express-rate-limit to v6.11.2 (#976)
renovate[bot] Sep 12, 2023
e9c0af1
chore(deps): update dependency jest to v29.7.0 (#977)
renovate[bot] Sep 12, 2023
e6c9734
chore(deps): update dependency @tsconfig/node18 to v18.2.2 (#981)
renovate[bot] Sep 13, 2023
3aa1c60
chore(deps): update mongo:4 docker digest to 90e9402 (#982)
renovate[bot] Sep 13, 2023
41d7de0
chore(deps): update dependency @types/node to v18.17.16 (#983)
renovate[bot] Sep 15, 2023
9a02c09
chore(deps): update dependency express-rate-limit to v7 (#980)
renovate[bot] Sep 15, 2023
fc5e2ab
chore(deps): update dependency @types/jest to v29.5.5 (#984)
renovate[bot] Sep 15, 2023
4efe531
chore(deps): update dependency mongoose to v7.5.2 (#985)
renovate[bot] Sep 16, 2023
5859ac4
chore(deps): update dependency @types/node to v18.17.17 (#986)
renovate[bot] Sep 16, 2023
cb9b5f6
chore(deps): update dependency express-rate-limit to v7.0.1 (#987)
renovate[bot] Sep 16, 2023
31992e4
chore(deps): update docker/login-action action to v3 (#979)
renovate[bot] Sep 18, 2023
6a70ead
chore(deps): update docker/build-push-action action to v5 (#978)
renovate[bot] Sep 18, 2023
210b36d
chore(deps): update dependency node to v18.18.0 (#988)
renovate[bot] Sep 18, 2023
44eaf36
chore(deps): update dependency ws to v8.14.2 (#989)
renovate[bot] Sep 19, 2023
82718e7
chore(deps): update node:18-alpine docker digest to cae3c14 (#990)
renovate[bot] Sep 20, 2023
6833d2b
chore(deps): update dependency @types/node to v18.17.18 (#992)
renovate[bot] Sep 20, 2023
87eb12e
chore(deps): update node:18-alpine docker digest to 619ce27 (#991)
renovate[bot] Sep 20, 2023
b0435ee
chore(deps): update actions/checkout digest to 8ade135 (#993)
renovate[bot] Sep 22, 2023
a2d2e0f
chore(deps): update dependency eslint to v8.50.0 (#994)
renovate[bot] Sep 22, 2023
aca115a
chore(deps): update dependency @types/express to v4.17.18 (#995)
renovate[bot] Sep 23, 2023
58a4ea0
chore(deps): update dependency @types/node to v18.17.19 (#996)
renovate[bot] Sep 23, 2023
ef1f032
chore(deps): update dependency @types/superagent to v4.1.19 (#997)
renovate[bot] Sep 25, 2023
e723586
chore(deps): update dependency @types/ws to v8.5.6 (#998)
renovate[bot] Sep 25, 2023
549c113
chore(deps): update dependency mongoose to v7.5.3 (#999)
renovate[bot] Sep 25, 2023
0739d6a
chore(deps): update dependency express-rate-limit to v7.0.2 (#1001)
renovate[bot] Sep 26, 2023
bec38ae
chore(deps): update dependency @types/morgan to v1.9.6 (#1002)
renovate[bot] Sep 27, 2023
7747e5f
chore(deps): update node:18-alpine docker digest to 63f8799 (#1003)
renovate[bot] Sep 29, 2023
e6eebac
chore(deps): update node:18-alpine docker digest to a315556 (#1004)
renovate[bot] Sep 29, 2023
a89934d
chore(deps): update mongo:4 docker digest to 4dc2186 (#1005)
renovate[bot] Oct 3, 2023
8d93c9d
chore(deps): update dependency mongoose to v7.5.4 (#1007)
renovate[bot] Oct 4, 2023
da0e905
chore(deps): update dependency eslint to v8.51.0 (#1008)
renovate[bot] Oct 6, 2023
1399120
chore(deps): update dependency @types/express to v4.17.19 (#1011)
renovate[bot] Oct 10, 2023
1194ca5
chore(deps): update mongo:4 docker digest to 4ed628d (#1013)
renovate[bot] Oct 11, 2023
9cc859a
chore(deps): update node:18-alpine docker digest to e031604 (#1014)
renovate[bot] Oct 11, 2023
56e76a2
chore(deps): update node:18-alpine docker digest to dc64dfc (#1015)
renovate[bot] Oct 12, 2023
7fb490b
chore(deps): update node:18-alpine docker digest to 69f25cb (#1016)
renovate[bot] Oct 12, 2023
3c9896f
chore(deps): update node:18-alpine docker digest to 617b85a (#1017)
renovate[bot] Oct 13, 2023
10b1a32
chore(deps): update mongo:4 docker digest to dd66acb (#1018)
renovate[bot] Oct 13, 2023
d3b2f75
chore(deps): update dependency @types/ws to v8.5.7 (#1012)
renovate[bot] Oct 13, 2023
b78b8d8
Remove URL options (#1020)
Ta1al Oct 15, 2023
498513d
chore(deps): update dependency bufferutil to v4.0.8 (#1021)
renovate[bot] Oct 15, 2023
775643c
chore(deps): update dependency winston to v3.11.0 (#1010)
renovate[bot] Oct 16, 2023
49fd058
chore(deps): update mongoose (#1009)
renovate[bot] Oct 16, 2023
46446ee
chore(deps): update dependency express-rate-limit to v7.1.1 (#1006)
renovate[bot] Oct 16, 2023
da555a4
Remove URL options (#1022)
Ta1al Oct 16, 2023
0b51e87
chore(deps): update node:18-alpine docker digest to f3f9633 (#1023)
renovate[bot] Oct 16, 2023
97f698f
chore(deps): update node:18-alpine docker digest to 0fe7402 (#1024)
renovate[bot] Oct 16, 2023
9b9bc9c
chore(deps): update dependency mongoose to v7.6.3 (#1025)
renovate[bot] Oct 17, 2023
e3eb5a5
chore(deps): update dependency @types/express to v4.17.20 (#1026)
renovate[bot] Oct 18, 2023
8167045
chore(deps): update dependency @types/jest to v29.5.6 (#1027)
renovate[bot] Oct 18, 2023
fb4c224
chore(deps): update dependency @types/morgan to v1.9.7 (#1028)
renovate[bot] Oct 18, 2023
48f9b9e
chore(deps): update dependency @types/superagent to v4.1.20 (#1029)
renovate[bot] Oct 18, 2023
77485db
chore(deps): update node:18-alpine docker digest to dc2dd9d (#1031)
renovate[bot] Oct 18, 2023
ec5e6a9
chore(deps): update node:18-alpine docker digest to c0a41cc (#1033)
renovate[bot] Oct 18, 2023
e9348b4
chore(deps): update node:18-alpine docker digest to 435dcad (#1034)
renovate[bot] Oct 19, 2023
c527301
chore(deps): update dependency @types/time-limited-regular-expression…
renovate[bot] Oct 19, 2023
9335134
chore(deps): update dependency @types/ws to v8.5.8 (#1032)
renovate[bot] Oct 19, 2023
0f5a90b
chore(deps): update actions/checkout digest to b4ffde6 (#1035)
renovate[bot] Oct 19, 2023
734e313
chore(deps): update dependency eslint to v8.52.0 (#1036)
renovate[bot] Oct 20, 2023
41ba3d5
chore(deps): update dependency express-rate-limit to v7.1.2 (#1037)
renovate[bot] Oct 23, 2023
0a673c1
chore(deps): update actions/setup-node digest to 1a4442c (#1038)
renovate[bot] Oct 23, 2023
2e4020f
chore(deps): update dependency express-rate-limit to v7.1.3 (#1040)
renovate[bot] Oct 26, 2023
a292158
chore(deps): update dependency zlib-sync to v0.1.9 (#1041)
renovate[bot] Oct 28, 2023
537f4aa
chore(deps): update dependency @types/jest to v29.5.7 (#1042)
renovate[bot] Oct 30, 2023
047f0c3
chore(deps): update dependency mongoose to v7.6.4 (#1043)
renovate[bot] Oct 31, 2023
245d6d9
chore(deps): lock file maintenance (#1045)
renovate[bot] Nov 1, 2023
b1855ba
chore(deps): update dependency eslint to v8.53.0 (#1047)
renovate[bot] Nov 4, 2023
8ed908a
chore(deps): update dependency express-rate-limit to v7.1.4 (#1048)
renovate[bot] Nov 6, 2023
4ec8647
chore(deps): update dependency @types/morgan to v1.9.8 (#1049)
renovate[bot] Nov 6, 2023
852a6e2
chore(deps): update dependency @types/express to v4.17.21 (#1050)
renovate[bot] Nov 7, 2023
de93bff
chore(deps): update dependency @types/morgan to v1.9.9 (#1051)
renovate[bot] Nov 7, 2023
0a70b09
chore(deps): update dependency @types/superagent to v4.1.21 (#1053)
renovate[bot] Nov 7, 2023
66a3bb9
chore(deps): update dependency @types/ws to v8.5.9 (#1056)
renovate[bot] Nov 7, 2023
fbf9b1c
chore(deps): update dependency @types/time-limited-regular-expression…
renovate[bot] Nov 8, 2023
d2476f4
chore(deps): update node:18-alpine docker digest to 1eb3dfe (#1058)
renovate[bot] Nov 16, 2023
e33650f
chore(deps): update node:18-alpine docker digest to a7782e5 (#1060)
renovate[bot] Nov 16, 2023
dc75fce
chore(deps): update mongo:4 docker digest to 5f30665 (#1059)
renovate[bot] Nov 16, 2023
3a37fa8
chore(deps): update dependency @types/superagent to v4.1.22 (#1062)
renovate[bot] Nov 16, 2023
e01f88b
chore(deps): update node:18-alpine docker digest to 3428c2d (#1061)
renovate[bot] Nov 16, 2023
76a8111
chore(deps): update dependency @types/jest to v29.5.8 (#1055)
renovate[bot] Nov 16, 2023
0475d4d
chore(deps): update docker/build-push-action digest to 4a13e50 (#1063)
renovate[bot] Nov 17, 2023
aed9368
chore(deps): update dependency eslint to v8.54.0 (#1064)
renovate[bot] Nov 17, 2023
9553d5b
chore(deps): update dependency typescript to v5.3.2 (#1065)
renovate[bot] Nov 20, 2023
092e8ac
chore(deps): update dependency @types/jest to v29.5.9 (#1066)
renovate[bot] Nov 21, 2023
d5e3c7a
chore(deps): update dependency @types/ws to v8.5.10 (#1067)
renovate[bot] Nov 21, 2023
815859b
chore(deps): update dependency node to v18.18.2 (#1000)
renovate[bot] Nov 21, 2023
99fb1d0
chore(deps): update actions/setup-node action to v4 (#1039)
renovate[bot] Nov 21, 2023
1ac36e2
chore(deps): update dependency mongoose to v8 (#1044)
renovate[bot] Nov 21, 2023
fb5d66e
chore(deps): update dependency @types/jest to v29.5.10 (#1068)
renovate[bot] Nov 22, 2023
221a4bd
chore(deps): update dependency @types/node to v18.18.12 (#1069)
renovate[bot] Nov 22, 2023
9415997
chore(deps): update dependency discord.js to v14.14.1 (#1057)
renovate[bot] Nov 22, 2023
d868654
feat: self-hosted gha-runners (#1070)
promise Nov 22, 2023
1f767f5
chore(deps): update dependency @typegoose/typegoose to v11.7.1 (#1046)
renovate[bot] Nov 23, 2023
0edc32b
chore(deps): update dependency helmet to v7.1.0 (#1052)
renovate[bot] Nov 23, 2023
a69c8b3
chore(deps): update dependency @types/node to v18.18.13 (#1071)
renovate[bot] Nov 24, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .docker/docker-compose-stack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ services:
depends_on:
- db
db:
image: mongo:4@sha256:033255f596fb18ee947fabef1377f666f96ff0c0328242a7ff219c284537a76f
image: mongo:4@sha256:5f3066565902a2221ad529ba4f7f8ee5ee386156caffb72ff28a779c6da8a598
restart: always
volumes:
- ./database:/data/db
4 changes: 2 additions & 2 deletions .github/workflows/docker-compose-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ on:
jobs:
build:
name: Test Build
runs-on: ubuntu-latest
runs-on: self-hosted

steps:
- name: Checkout
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4

- name: Add .env file
run: echo "API_PORT=1234" > .env
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@ on:
jobs:
ghcr:
name: ${{ github.ref == 'refs/heads/main' && 'Build and Push' || 'Test Build' }}
runs-on: ubuntu-latest
runs-on: self-hosted

steps:
- name: Checkout
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4

- name: Login to ghcr.io
uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2
uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: ${{ github.ref == 'refs/heads/main' && 'Build and Push' || 'Test Build' }}
uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 # v4
uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5
with:
push: ${{ github.ref == 'refs/heads/main' }}
tags: ghcr.io/countr/countr:latest
2 changes: 1 addition & 1 deletion .github/workflows/issue-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
jobs:
greeting:
name: Greet new users
runs-on: ubuntu-latest
runs-on: self-hosted
steps:
- uses: actions/first-interaction@v1
with:
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,21 @@ on:
jobs:
eslint:
name: ESLint
runs-on: ubuntu-latest
runs-on: self-hosted

steps:
- name: Checkout repository
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4

- name: Set up pnpm
uses: pnpm/action-setup@v2
with:
version: 8

- name: Set up node
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3
uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4
with:
node-version-file: ".nvmrc"
cache: "pnpm"

- name: Install dependencies
run: pnpm install --frozen-lockfile
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,21 @@ on:
jobs:
jest:
name: Jest
runs-on: ubuntu-latest
runs-on: self-hosted

steps:
- name: Checkout repository
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4

- name: Set up pnpm
uses: pnpm/action-setup@v2
with:
version: 8

- name: Set up node
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3
uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4
with:
node-version-file: ".nvmrc"
cache: "pnpm"

- name: Install dependencies
run: pnpm install --frozen-lockfile
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.17.1
18.18.2
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18-alpine@sha256:3482a20c97e401b56ac50ba8920cc7b5b2022bfc6aa7d4e4c231755770cf892f AS base
FROM node:18-alpine@sha256:3428c2de886bf4378657da6fe86e105573a609c94df1f7d6a70e57d2b51de21f AS base

WORKDIR /app
ENV IS_DOCKER=true
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ services:
depends_on:
- db
db:
image: mongo:4@sha256:033255f596fb18ee947fabef1377f666f96ff0c0328242a7ff219c284537a76f
image: mongo:4@sha256:5f3066565902a2221ad529ba4f7f8ee5ee386156caffb72ff28a779c6da8a598
restart: always
volumes:
- ./database:/data/db
40 changes: 20 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,44 +34,44 @@
},
"dependencies": {
"@emmetio/math-expression": "1.0.5",
"@typegoose/typegoose": "11.4.1",
"@typegoose/typegoose": "11.7.1",
"ajv": "8.12.0",
"bufferutil": "4.0.7",
"bufferutil": "4.0.8",
"discord-token-reset": "github:promise/discord-tokens",
"discord.js": "14.13.0",
"discord.js": "14.14.1",
"dotenv": "16.3.1",
"erlpack": "github:discord/erlpack",
"express": "4.18.2",
"express-rate-limit": "6.9.0",
"helmet": "7.0.0",
"express-rate-limit": "7.1.4",
"helmet": "7.1.0",
"match-sorter": "6.3.1",
"mongoose": "7.4.5",
"mongoose": "8.0.1",
"morgan": "1.10.0",
"ordinal": "1.0.3",
"superagent": "8.1.2",
"time-limited-regular-expressions": "1.0.0",
"utf-8-validate": "6.0.3",
"winston": "3.10.0",
"winston": "3.11.0",
"winston-daily-rotate-file": "4.7.1",
"ws": "8.13.0",
"zlib-sync": "0.1.8"
"ws": "8.14.2",
"zlib-sync": "0.1.9"
},
"devDependencies": {
"@total-typescript/ts-reset": "0.5.1",
"@tsconfig/node18": "18.2.1",
"@tsconfig/node18": "18.2.2",
"@tsconfig/strictest": "2.0.2",
"@types/express": "4.17.17",
"@types/jest": "29.5.4",
"@types/morgan": "1.9.5",
"@types/node": "18.17.12",
"@types/superagent": "4.1.18",
"@types/time-limited-regular-expressions": "1.0.0",
"@types/ws": "8.5.5",
"eslint": "8.48.0",
"@types/express": "4.17.21",
"@types/jest": "29.5.10",
"@types/morgan": "1.9.9",
"@types/node": "18.18.13",
"@types/superagent": "4.1.22",
"@types/time-limited-regular-expressions": "1.0.2",
"@types/ws": "8.5.10",
"eslint": "8.54.0",
"eslint-config-promise": "github:promise/eslint-config",
"jest": "29.6.4",
"jest": "29.7.0",
"ts-jest": "29.1.1",
"typescript": "5.2.2"
"typescript": "5.3.2"
},
"eslintConfig": {
"extends": "promise"
Expand Down
Loading
Loading