Skip to content

Commit ed8a70c

Browse files
authored
Merge branch 'main' into en-dash-versions-range
2 parents 3105379 + 1f060b8 commit ed8a70c

File tree

285 files changed

+16936
-9802
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

285 files changed

+16936
-9802
lines changed

.github/ISSUE_TEMPLATE/1-app-bug.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ body:
5656
label: Additional context
5757
description: Add any other context about the problem here.
5858
validations:
59-
required: false
59+
required: false

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ body:
4343
label: Additional context
4444
description: Add any other context or screenshots about the suggested enhancement here.
4545
validations:
46-
required: false
46+
required: false

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ contact_links:
1111
url: https://roadmap.modrinth.com
1212
- name: 📚 Documentation
1313
about: Useful documentation about Modrinth's API
14-
url: https://docs.modrinth.com
14+
url: https://docs.modrinth.com

.github/workflows/daedalus-docker.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ on:
88
- .github/workflows/daedalus-docker.yml
99
- 'apps/daedalus_client/**'
1010
pull_request:
11-
types: [ opened, synchronize ]
11+
types: [opened, synchronize]
1212
paths:
1313
- .github/workflows/daedalus-docker.yml
1414
- 'apps/daedalus_client/**'
1515
merge_group:
16-
types: [ checks_requested ]
16+
types: [checks_requested]
1717

1818
jobs:
1919
docker:
@@ -26,15 +26,13 @@ jobs:
2626
uses: docker/metadata-action@v3
2727
with:
2828
images: ghcr.io/modrinth/daedalus
29-
-
30-
name: Login to GitHub Images
29+
- name: Login to GitHub Images
3130
uses: docker/login-action@v1
3231
with:
3332
registry: ghcr.io
3433
username: ${{ github.actor }}
3534
password: ${{ secrets.GITHUB_TOKEN }}
36-
-
37-
name: Build and push
35+
- name: Build and push
3836
id: docker_build
3937
uses: docker/build-push-action@v2
4038
with:

.github/workflows/daedalus-run.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ jobs:
2121
username: ${{ github.actor }}
2222
password: ${{ secrets.GITHUB_TOKEN }}
2323

24-
2524
- name: Pull Docker image from GHCR
2625
run: docker pull ghcr.io/modrinth/daedalus:main
2726

.github/workflows/labrinth-docker.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ on:
88
- .github/workflows/labrinth-docker.yml
99
- 'apps/labrinth/**'
1010
pull_request:
11-
types: [ opened, synchronize ]
11+
types: [opened, synchronize]
1212
paths:
1313
- .github/workflows/labrinth-docker.yml
1414
- 'apps/labrinth/**'
1515
merge_group:
16-
types: [ checks_requested ]
16+
types: [checks_requested]
1717

1818
jobs:
1919
docker:
@@ -29,19 +29,17 @@ jobs:
2929
uses: docker/metadata-action@v3
3030
with:
3131
images: ghcr.io/modrinth/labrinth
32-
-
33-
name: Login to GitHub Images
32+
- name: Login to GitHub Images
3433
uses: docker/login-action@v1
3534
with:
3635
registry: ghcr.io
3736
username: ${{ github.actor }}
3837
password: ${{ secrets.GITHUB_TOKEN }}
39-
-
40-
name: Build and push
38+
- name: Build and push
4139
id: docker_build
4240
uses: docker/build-push-action@v2
4341
with:
4442
context: ./apps/labrinth
4543
push: ${{ github.event_name != 'pull_request' }}
4644
tags: ${{ steps.docker_meta.outputs.tags }}
47-
labels: ${{ steps.docker_meta.outputs.labels }}
45+
labels: ${{ steps.docker_meta.outputs.labels }}

.github/workflows/turbo-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ name: CI
22

33
on:
44
push:
5-
branches: ["main"]
5+
branches: ['main']
66
pull_request:
77
types: [opened, synchronize]
88
merge_group:
9-
types: [ checks_requested ]
9+
types: [checks_requested]
1010

1111
jobs:
1212
build:

.idea/daedalus.iml renamed to .idea/code.iml

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.vscode/settings.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
{
22
"prettier.endOfLine": "lf",
33
"editor.formatOnSave": true,
4-
"eslint.validate": [
5-
"javascript",
6-
"javascriptreact",
7-
"typescript",
8-
"typescriptreact"
9-
],
4+
"eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"],
105
"editor.codeActionsOnSave": {
116
"source.fixAll.eslint": "explicit"
127
}

0 commit comments

Comments
 (0)