Skip to content

Commit dcc5b1d

Browse files
authored
Merge branch 'main' into feature/reverse_sorting
2 parents f978f8c + 0f23363 commit dcc5b1d

File tree

8 files changed

+378
-264
lines changed

8 files changed

+378
-264
lines changed

.github/workflows/ci.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,11 @@ jobs:
1919
uses: astral-sh/ruff-action@v2
2020
with:
2121
args: "format --check"
22+
23+
- name: Setup Biome
24+
uses: biomejs/setup-biome@v2
25+
with:
26+
version: latest
27+
28+
- name: Run Biome
29+
run: biome ci .

Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
format:
22
ruff format
3+
npx @biomejs/biome format --write
34

45
lint:
56
ruff check
7+
npx @biomejs/biome check
68

79
lint-fix:
810
ruff check --fix
11+
npx @biomejs/biome check --fix

README.md

+26-3
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,37 @@ admin interface, go back to the main interface. You're now logged in.
7676

7777
## Contributing
7878

79-
Before committing make sure to install the git pre-commit hook to adhere to the
80-
codestyle.
79+
Code formatting and linting is done using [`ruff`] and [`biome`]. You can run
80+
formatting using `make format`. Linting can be done using `make lint` and
81+
automatic fixing of linting errors can be done using `make lint-fix`. CI checks
82+
that you adhere to these coding standards.
83+
84+
You can install the git pre-commit hook to help you adhere to the codestyle:
8185

8286
```bash
8387
ln -s ../../tools/githook/pre-commit .git/hooks/
84-
8588
```
8689

90+
[`ruff`]: https://docs.astral.sh/ruff/
91+
[`biome`]: https://biomejs.dev/
92+
93+
### Discord
94+
95+
If you want to discuss development of a fix/feature over chat. Please join the
96+
`#commitfest-dev` channel on the ["PostgreSQL Hacking" Discord server][1]
97+
98+
[1]: https://discord.gg/XZy2DXj7Wz
99+
100+
### Staging server
101+
102+
The staging server is available at: <https://commitfest-test.postgresql.org/>
103+
User and password for the HTTP authentication popup are both `pgtest`. The
104+
`main` branch is automatically deployed to the staging server. After some time
105+
on the staging server, commits will be merged into the `prod` branch, which
106+
automatically deploys to the production server.
107+
108+
### Regenerating the database dump files
109+
87110
If you'd like to regenerate the database dump files, you can run the following commands:
88111
```
89112
./manage.py dumpdata auth --format=json --indent=4 --exclude=auth.permission > pgcommitfest/commitfest/fixtures/auth_data.json

biome.json

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
3+
"vcs": {
4+
"enabled": false,
5+
"clientKind": "git",
6+
"useIgnoreFile": false
7+
},
8+
"files": {
9+
"ignoreUnknown": true,
10+
"ignore": [],
11+
"include": [
12+
"media/commitfest/js/commitfest.js",
13+
"media/commitfest/css/commitfest.css",
14+
"biome.json"
15+
]
16+
},
17+
"formatter": {
18+
"enabled": true,
19+
"indentStyle": "space",
20+
"indentWidth": 4
21+
},
22+
"organizeImports": {
23+
"enabled": true
24+
},
25+
"linter": {
26+
"enabled": true,
27+
"rules": {
28+
"recommended": true
29+
}
30+
},
31+
"javascript": {
32+
"formatter": {
33+
"quoteStyle": "double"
34+
}
35+
}
36+
}

media/commitfest/css/commitfest.css

+17-19
Original file line numberDiff line numberDiff line change
@@ -4,47 +4,45 @@
44

55
/* For close button with float disabled */
66
.close-nofloat {
7-
float: none !important;
7+
float: none !important;
88
}
99

1010
/* General form styling */
1111
.form-horizontal div.form-group {
12-
margin-bottom: 10px;
12+
margin-bottom: 10px;
1313
}
1414
div.form-group div.controls ul {
15-
list-style-type: none;
16-
margin: 0px;
17-
padding: 0px;
15+
list-style-type: none;
16+
margin: 0px;
17+
padding: 0px;
1818
}
1919
div.form-group div.controls ul li {
20-
display: inline;
20+
display: inline;
2121
}
2222
div.form-group div.controls ul li label {
23-
display: inline;
24-
font-weight: normal;
25-
vertical-align:middle;
23+
display: inline;
24+
font-weight: normal;
25+
vertical-align: middle;
2626
}
2727
div.form-group div.controls ul li label input {
28-
display: inline;
29-
vertical-align:middle;
28+
display: inline;
29+
vertical-align: middle;
3030
}
31-
div.form-group div.controls input[type='checkbox'] {
32-
width: 10px;
31+
div.form-group div.controls input[type="checkbox"] {
32+
width: 10px;
3333
}
3434

3535
div.form-group div.controls input.threadpick-input {
36-
width: 80%;
37-
display: inline;
36+
width: 80%;
37+
display: inline;
3838
}
3939

40-
41-
4240
/*
4341
* Attach thread dialog
4442
*/
4543
#attachThreadListWrap.loading {
4644
display: block;
47-
background: url('/media/commitfest/spinner.gif') no-repeat center;
45+
background: url("/media/commitfest/spinner.gif") no-repeat center;
4846
width: 124px;
4947
height: 124px;
5048
margin: 0 auto;
@@ -57,7 +55,7 @@ div.form-group div.controls input.threadpick-input {
5755
* Annotate message dialog */
5856
#annotateMessageBody.loading {
5957
display: block;
60-
background: url('/media/commitfest/spinner.gif') no-repeat center;
58+
background: url("/media/commitfest/spinner.gif") no-repeat center;
6159
width: 124px;
6260
height: 124px;
6361
margin: 0 auto;

0 commit comments

Comments
 (0)