Skip to content

Commit 04030c1

Browse files
authored
ci: bump super-linter (#961)
1 parent 6c511ee commit 04030c1

Some content is hidden

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

45 files changed

+1262
-1060
lines changed

.github/dependabot.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
version: 2
22
updates:
3-
-
4-
package-ecosystem: github-actions
3+
- package-ecosystem: github-actions
54
directory: /
65
schedule:
76
interval: weekly

.github/linters/.markdown-lint.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@
1818
###############
1919
# Rules by id #
2020
###############
21-
MD004: false # Unordered list style
21+
MD004: false # Unordered list style
2222
MD007:
23-
indent: 2 # Unordered list indentation
23+
indent: 2 # Unordered list indentation
2424
MD010:
2525
ignore_code_languages: [caddyfile]
2626
MD013: false
2727
MD026:
28-
punctuation: ".,;:!。,;:" # List of not allowed
29-
MD029: false # Ordered list item prefix
30-
MD033: false # Allow inline HTML
31-
MD036: false # Emphasis used instead of a heading
28+
punctuation: ".,;:!。,;:" # List of not allowed
29+
MD029: false # Ordered list item prefix
30+
MD033: false # Allow inline HTML
31+
MD036: false # Emphasis used instead of a heading
3232

3333
#################
3434
# Rules by tags #
3535
#################
36-
blank_lines: false # Error on blank lines
36+
blank_lines: false # Error on blank lines

.github/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ Examples:
2222
docs: Add docs for X
2323
2424
spec: Z disambiguation
25-
-->
25+
-->

.github/workflows/cd-chart.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Release Chart
33
on:
44
push:
55
tags:
6-
- 'v*'
6+
- "v*"
77

88
jobs:
99
release:

.github/workflows/cd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Set up Go
3030
uses: actions/setup-go@v5
3131
with:
32-
go-version: '1.23'
32+
go-version: "1.23"
3333
cache-dependency-path: |
3434
go.sum
3535
caddy/go.sum
@@ -68,7 +68,7 @@ jobs:
6868
if: startsWith(github.ref, 'refs/tags/v')
6969
uses: actions/attest-build-provenance@v1
7070
with:
71-
subject-path: '${{ github.workspace }}/dist/**/mercure'
71+
subject-path: "${{ github.workspace }}/dist/**/mercure"
7272

7373
- name: Display version
7474
run: dist/caddy_linux_amd64_v1/mercure version

.github/workflows/ci-chart.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
- uses: actions/setup-python@v5
2828
with:
29-
python-version: '3.10'
29+
python-version: "3.10"
3030

3131
- name: Set up chart-testing
3232
uses: helm/chart-testing-action@v2

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
- v*.*.*
1212

1313
env:
14-
GO111MODULE: 'on'
14+
GO111MODULE: "on"
1515

1616
jobs:
1717
golangci:
@@ -23,7 +23,7 @@ jobs:
2323

2424
- uses: actions/setup-go@v5
2525
with:
26-
go-version: '1.23'
26+
go-version: "1.23"
2727
cache-dependency-path: |
2828
go.sum
2929
caddy/go.sum
@@ -37,7 +37,7 @@ jobs:
3737
test:
3838
strategy:
3939
matrix:
40-
go: [ '1.21', '1.22', '1.23' ]
40+
go: ["1.21", "1.22", "1.23"]
4141
fail-fast: false
4242
name: Test
4343
runs-on: ubuntu-latest
@@ -82,8 +82,8 @@ jobs:
8282

8383
- uses: actions/setup-node@v4
8484
with:
85-
node-version: '16'
86-
cache: 'npm'
85+
node-version: "16"
86+
cache: "npm"
8787
cache-dependency-path: conformance-tests/package-lock.json
8888

8989
- name: Install Playwrigth dependencies

.github/workflows/lint.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ jobs:
3535
VALIDATE_GO_RELEASER: false
3636
VALIDATE_PHP_PHPCS: false
3737
VALIDATE_KUBERNETES_KUBECONFORM: false
38-
VALIDATE_JAVASCRIPT_PRETTIER: false
39-
VALIDATE_TYPESCRIPT_PRETTIER: false
38+
VALIDATE_JAVASCRIPT_STANDARD: false
4039
VALIDATE_TYPESCRIPT_STANDARD: false
4140
VALIDATE_PYTHON_PYLINT: false

.prettierignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# The spec is in the IETF flavor of Markdown
2+
spec/mercure.md
3+
4+
# Ignore Kubernetes templates
5+
**/charts/**/*.yaml
6+
**/chart/**/*.yaml
7+
charts/mercure/README.md
8+
9+
*cache

.vscode/launch.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{
2-
"version": "0.2.0",
3-
"configurations": [
4-
{
5-
"name": "Launch the hub",
6-
"type": "go",
7-
"request": "launch",
8-
"mode": "auto",
9-
"program": "${workspaceFolder}/caddy/mercure",
10-
"env": {
11-
"MERCURE_PUBLISHER_JWT_KEY": "!ChangeThisMercureHubJWTSecretKey!",
12-
"MERCURE_SUBSCRIBER_JWT_KEY": "!ChangeThisMercureHubJWTSecretKey!",
13-
"MERCURE_EXTRA_DIRECTIVES": "anonymous\nwrite_timeout 10s",
14-
"GLOBAL_OPTIONS": "debug",
15-
"SERVER_NAME": "localhost, host.docker.internal",
16-
"CADDY_SERVER_EXTRA_DIRECTIVES": "tls internal"
17-
},
18-
"args": ["run", "--config", "../../dev.Caddyfile"]
19-
}
20-
]
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
"name": "Launch the hub",
6+
"type": "go",
7+
"request": "launch",
8+
"mode": "auto",
9+
"program": "${workspaceFolder}/caddy/mercure",
10+
"env": {
11+
"MERCURE_PUBLISHER_JWT_KEY": "!ChangeThisMercureHubJWTSecretKey!",
12+
"MERCURE_SUBSCRIBER_JWT_KEY": "!ChangeThisMercureHubJWTSecretKey!",
13+
"MERCURE_EXTRA_DIRECTIVES": "anonymous\nwrite_timeout 10s",
14+
"GLOBAL_OPTIONS": "debug",
15+
"SERVER_NAME": "localhost, host.docker.internal",
16+
"CADDY_SERVER_EXTRA_DIRECTIVES": "tls internal"
17+
},
18+
"args": ["run", "--config", "../../dev.Caddyfile"]
19+
}
20+
]
2121
}

CONTRIBUTING.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ If you include code from another project, please mention it in the Pull Request
1414
The commit message must follow the [Conventional Commits specification](https://www.conventionalcommits.org/).
1515
The following types are allowed:
1616

17-
* `fix`: bugfix
18-
* `feat`: new feature
19-
* `docs`: change in the documentation
20-
* `spec`: spec change
21-
* `test`: test-related change
22-
* `perf`: performance optimization
23-
* `ci`: CI-related change
17+
- `fix`: bugfix
18+
- `feat`: new feature
19+
- `docs`: change in the documentation
20+
- `spec`: spec change
21+
- `test`: test-related change
22+
- `perf`: performance optimization
23+
- `ci`: CI-related change
2424

2525
Examples:
2626

@@ -61,10 +61,10 @@ Go to `http://localhost:3000` and enjoy!
6161

6262
When you send a PR, make sure that:
6363

64-
* You add valid test cases.
65-
* Tests are green.
66-
* You make a PR on the related documentation.
67-
* You make the PR on the same branch you based your changes on. If you see commits
64+
- You add valid test cases.
65+
- Tests are green.
66+
- You make a PR on the related documentation.
67+
- You make the PR on the same branch you based your changes on. If you see commits
6868
that you did not make in your PR, you're doing it wrong.
6969

7070
### Configuring Visual Studio Code
@@ -88,10 +88,10 @@ It is then converted in the [the "xml2rfc" Version 3 Vocabulary](https://tools.i
8888

8989
To contribute to the protocol itself:
9090

91-
* Make your changes
92-
* [Download Mmark](https://github.com/mmarkdown/mmark/releases)
93-
* [Download `xml2rfc` using pip](https://pypi.org/project/xml2rfc/): `pip install xml2rfc`
94-
* Generate the XML file: `mmark spec/mercure.md > spec/mercure.xml`
95-
* Validate the generated XML file and generate the text file: `xml2rfc --text --v3 spec/mercure.xml`
96-
* Remove non-ASCII characters from the generated `mercure.txt` file (example: K**é**vin)
97-
* If appropriate, be sure to update the reference implementation accordingly
91+
- Make your changes
92+
- [Download Mmark](https://github.com/mmarkdown/mmark/releases)
93+
- [Download `xml2rfc` using pip](https://pypi.org/project/xml2rfc/): `pip install xml2rfc`
94+
- Generate the XML file: `mmark spec/mercure.md > spec/mercure.xml`
95+
- Validate the generated XML file and generate the text file: `xml2rfc --text --v3 spec/mercure.xml`
96+
- Remove non-ASCII characters from the generated `mercure.txt` file (example: K**é**vin)
97+
- If appropriate, be sure to update the reference implementation accordingly

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<h1 align="center"><a href="https://mercure.rocks"><img src="public/mercure.svg" alt="Mercure: Real-time Made Easy" title="Live Updates Made Easy"></a></h1>
22

3-
*Protocol and Reference Implementation*
3+
_Protocol and Reference Implementation_
44

55
Mercure is a protocol for pushing data updates to web browsers and other HTTP clients in a convenient, fast, reliable, and battery-efficient way.
66
It is especially useful to publish async and real-time updates of resources served through web APIs, to reactive web and mobile apps.
@@ -14,9 +14,9 @@ It is especially useful to publish async and real-time updates of resources serv
1414

1515
![Subscriptions Schema](spec/subscriptions.png)
1616

17-
* [Getting started](https://mercure.rocks/docs/getting-started)
18-
* [Full documentation](https://mercure.rocks/docs)
19-
* [Demo](https://demo.mercure.rocks/)
17+
- [Getting started](https://mercure.rocks/docs/getting-started)
18+
- [Full documentation](https://mercure.rocks/docs)
19+
- [Demo](https://demo.mercure.rocks/)
2020

2121
[The protocol](https://mercure.rocks/spec) is maintained in this repository and is also available as [an Internet-Draft](https://datatracker.ietf.org/doc/draft-dunglas-mercure/).
2222

cmd/mercure/mercure.yaml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,22 @@ debug: true
33
allow_anonymous: true
44
#cert_file: fixtures/tls/server.crt
55
#key_file: fixtures/tls/server.key
6-
cors_allowed_origins: [http://localhost:3000, http://localhost:3001, http://localhost:5000, http://localhost:8000]
6+
cors_allowed_origins:
7+
[
8+
http://localhost:3000,
9+
http://localhost:3001,
10+
http://localhost:5000,
11+
http://localhost:8000,
12+
]
713
transport_url: bolt://update.db
8-
jwt_key: '!ChangeThisMercureHubJWTSecretKey!'
9-
publish_allowed_origins: [http://localhost:3000, http://localhost:3001, http://localhost:5000, http://localhost:8000]
14+
jwt_key: "!ChangeThisMercureHubJWTSecretKey!"
15+
publish_allowed_origins:
16+
[
17+
http://localhost:3000,
18+
http://localhost:3001,
19+
http://localhost:5000,
20+
http://localhost:8000,
21+
]
1022
subscriptions: true
1123

1224
metrics_enabled: false

0 commit comments

Comments
 (0)