Skip to content

Commit 89a34e8

Browse files
smashedrsmashedr
authored
Merge branch 'master' into dependabot/github_actions/sarisia/actions-status-discord-1.16.0
2 parents ea386e8 + 4add21b commit 89a34e8

17 files changed

Lines changed: 483 additions & 354 deletions

‎.gitattributes‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Fine-tune GitHub's language detection
2+
docs/**/*.md linguist-detectable=true
3+
docs/**/*.md linguist-documentation=false
4+
.vitepress/config.mts linguist-vendored

‎.github/actionlint.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
paths:
2+
.github/workflows/**/*.{yml,yaml}:
3+
ignore:
4+
- '"inputs" section is alias node but mapping node is expected'
5+
- '"paths" section must be sequence node but got alias node with "" tag'
6+
- '"paths-ignore" section must be sequence node but got alias node with "" tag'

‎.github/dependabot.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ updates:
33
- package-ecosystem: "github-actions"
44
directory: "/"
55
schedule:
6-
interval: "weekly"
6+
interval: "monthly"
77
#open-pull-requests-limit: 1
88

99
- package-ecosystem: "npm"
1010
directory: "/"
1111
schedule:
12-
interval: "weekly"
12+
interval: "monthly"
1313
#open-pull-requests-limit: 1

‎.github/workflows/lint.yaml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ on:
77
push:
88
branches: [master]
99

10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: true
13+
1014
jobs:
1115
lint:
1216
name: "Lint"
@@ -18,11 +22,17 @@ jobs:
1822
- name: "Checkout"
1923
uses: actions/checkout@v6
2024

25+
- name: "Debug event.json"
26+
continue-on-error: true
27+
run: cat "${GITHUB_EVENT_PATH}"
2128
- name: "Debug CTX github"
2229
continue-on-error: true
2330
env:
2431
GITHUB_CTX: ${{ toJSON(github) }}
2532
run: echo "$GITHUB_CTX"
33+
- name: "Debug Environment"
34+
continue-on-error: true
35+
run: env
2636

2737
- name: "Setup Node 24"
2838
uses: actions/setup-node@v6
@@ -38,46 +48,36 @@ jobs:
3848
run: |
3949
npm run docs:deploy
4050
41-
#- name: "ESLint"
51+
#- name: "esLint"
4252
# if: ${{ !cancelled() }}
4353
# run: |
4454
# npm run lint
4555

46-
- name: "Prettier Check"
56+
- name: "prettier"
4757
if: ${{ !cancelled() }}
4858
run: |
4959
npm run prettier:check
5060
51-
- name: "Yamllint"
61+
- name: "yamllint"
5262
if: ${{ !cancelled() }}
5363
env:
54-
CONFIG: "{extends: relaxed, ignore: [node_modules/], rules: {line-length: {max: 119}}}"
64+
CONFIG: .github/yamllint.yaml
5565
run: |
5666
echo "::group::List Files"
57-
yamllint -d '${{ env.CONFIG }}' --list-files .
67+
yamllint -c "${{ env.CONFIG }}" --list-files .
5868
echo "::endgroup::"
59-
yamllint -d '${{ env.CONFIG }}' .
69+
yamllint -c "${{ env.CONFIG }}" .
6070
61-
- name: "Actionlint"
71+
- name: "actionlint"
6272
if: ${{ !cancelled() }}
63-
run: |
64-
echo "::group::Download"
65-
loc=$(curl -sI https://github.com/rhysd/actionlint/releases/latest | grep -i '^location:')
66-
echo "loc: ${loc}"
67-
tag=$(echo "${loc}" | sed -E 's|.*/tag/v?(.*)|\1|' | tr -d '\t\r\n')
68-
echo "tag: ${tag}"
69-
url="https://github.com/rhysd/actionlint/releases/latest/download/actionlint_${tag}_linux_amd64.tar.gz"
70-
echo "url: ${url}"
71-
curl -sL "${url}" | tar xz -C "${RUNNER_TEMP}" actionlint
72-
file "${RUNNER_TEMP}/actionlint"
73-
"${RUNNER_TEMP}/actionlint" --version
74-
echo "::endgroup::"
75-
"${RUNNER_TEMP}/actionlint" -color -verbose -shellcheck= -pyflakes=
73+
uses: cssnr/actionlint-action@v1
74+
with:
75+
shellcheck_opts: -e SC2129
7676

7777
# Note: this will most likely be split into two different workflows...
7878
- name: "Check Docs Changes"
7979
id: docs-changed
80-
uses: tj-actions/changed-files@24d32ffd492484c1d75e0c0b894501ddb9d30d62 # v47
80+
uses: tj-actions/changed-files@7dee1b0c1557f278e5c7dc244927139d78c0e22a # v47.0.4
8181
with:
8282
files: |
8383
docs/**

‎.github/workflows/pages.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,4 @@ jobs:
8484
uses: sarisia/actions-status-discord@eb045afee445dc055c18d3d90bd0f244fd062708 # v1.16.0
8585
with:
8686
webhook: ${{ secrets.DISCORD_WEBHOOK }}
87-
description: ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }}
87+
description: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}

‎.github/yamllint.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
extends: relaxed
2+
3+
ignore-from-file: .gitignore
4+
5+
rules:
6+
line-length:
7+
max: 119

‎.gitignore‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
.idea/
22
*.iml
33
.vscode/
4-
**/cache/
5-
**/dist/
4+
cache/
5+
dist/
66
build/
77
node_modules/
8-
.vitepress/contributors.json
8+
contributors.json

‎.prettierignore‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
.idea/
2-
.vscode/
3-
dist/
4-
node_modules/
1+
.github/disabled
2+
.github/pull_request_template.md
53
package-lock.json

‎.prettierrc.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
2-
"trailingComma": "es5",
32
"semi": false,
43
"singleQuote": true,
54
"printWidth": 120,
65
"overrides": [
76
{
87
"files": ["**/*.html", "**/*.yaml", "**/*.yml"],
98
"options": {
10-
"singleQuote": false
9+
"singleQuote": false,
10+
"printWidth": 120
1111
}
1212
},
1313
{
14-
"files": ["**/*.js", "**/*.css", "**/*.scss"],
14+
"files": ["**/*.js", "**/*.mjs", "**/*.css", "**/*.scss"],
1515
"options": {
1616
"tabWidth": 4
1717
}

‎.vitepress/config.mts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ export default defineConfig({
4848
['meta', { property: 'twitter:description', content: settings.description.short }],
4949
['meta', { property: 'twitter:image', content: settings.image }],
5050
['meta', { property: 'twitter:image:alt', content: settings.title }],
51+
52+
// ['script', { src: 'https://keepandroidopen.org/banner.js?size=mini&id=android' }],
5153
],
5254

5355
cleanUrls: true,

0 commit comments

Comments
 (0)