Skip to content

Commit

Permalink
Merge pull request #13 from Layers-of-Railways/main
Browse files Browse the repository at this point in the history
update to main
  • Loading branch information
Szedann authored Dec 28, 2023
2 parents 1680af4 + b637b29 commit 61843f1
Show file tree
Hide file tree
Showing 19 changed files with 623 additions and 526 deletions.
5 changes: 4 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# These are needed no matter what
DISCORD_TOKEN=
SERVER_ID=
SAY_LOGS_CHANNEL=
LOGS_CHANNEL=
SIMULATED_BAN_SHARE_LOGS_CHANNEL=

# These arent needed outside of production
MAVEN_REPO=
Expand All @@ -11,4 +13,5 @@ LOADING_EMOJI=
SUCCESS_EMOJI=
FAIL_EMOJI=
WEBSERVER_PORT=
DATABASE_URL=
DATABASE_URL=
SIMULATED_BAN_SHARE_KEY=
18 changes: 9 additions & 9 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,33 +23,33 @@ jobs:

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

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
if: ${{ matrix.platform != 'linux/amd64' }}

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Log in to the Container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: |
type=ref,event=branch
type=raw,value=latest
- name: Build and push by digest
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
id: build
with:
context: .
Expand Down Expand Up @@ -87,18 +87,18 @@ jobs:
path: /tmp/digests

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Log in to the Container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: |
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20

- name: Install pnpm
uses: pnpm/action-setup@v2

- name: Install dependencies
run: pnpm install

- name: Lint
run: pnpm run lint
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ node_modules/
eslint_report.json

.DS_Store

.idea
3 changes: 0 additions & 3 deletions README.md

This file was deleted.

28 changes: 15 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,29 @@
"lint:fix": "prettier --write ."
},
"dependencies": {
"@discordjs/rest": "1.7.1",
"@prisma/client": "5.1.1",
"@discordjs/builders": "^1.6.5",
"@discordjs/rest": "2.0.1",
"@prisma/client": "5.4.2",
"colorette": "^2.0.20",
"discord.js": "14.11.0",
"discord-api-types": "^0.37.60",
"discord.js": "14.13.0",
"express": "^4.18.2",
"gray-matter": "^4.0.3",
"tsx": "3.12.7",
"valibot": "^0.12.0"
"tsx": "3.13.0",
"valibot": "^0.19.0"
},
"devDependencies": {
"@types/express": "^4.17.17",
"@types/node": "20.3.1",
"@typescript-eslint/eslint-plugin": "5.60.1",
"@typescript-eslint/parser": "5.60.1",
"@types/express": "^4.17.19",
"@types/node": "20.8.6",
"@typescript-eslint/eslint-plugin": "6.7.5",
"@typescript-eslint/parser": "6.7.5",
"cross-env": "^7.0.3",
"dotenv": "16.3.1",
"eslint": "8.43.0",
"prettier": "2.8.8",
"prisma": "^5.1.1",
"eslint": "8.51.0",
"prettier": "3.0.3",
"prisma": "^5.4.2",
"ts-node": "^10.9.1",
"typescript": "5.1.3"
"typescript": "5.2.2"
},
"packageManager": "[email protected]"
}
Loading

0 comments on commit 61843f1

Please sign in to comment.