Skip to content

Commit cfc284e

Browse files
HoneyBearTechHoneyBearTech
authored
Merge branch 'linuxserver:master' into aura
2 parents a100482 + 54d9eae commit cfc284e

File tree

819 files changed

+13088
-6539
lines changed

Some content is hidden

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

819 files changed

+13088
-6539
lines changed

‎.editorconfig‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,7 @@ indent_style = space
2121
[*.{json,json5,webmanifest}]
2222
indent_size = 2
2323
indent_style = space
24+
25+
[*.php]
26+
indent_size = 4
27+
indent_style = space

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: "[BUG] - <your summary here>"
5+
labels: bug
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
Steps to reproduce the behavior:
15+
1. Go to '...'
16+
2. Click on '....'
17+
3. Scroll down to '....'
18+
4. See error
19+
20+
**Expected behavior**
21+
A clear and concise description of what you expected to happen.
22+
23+
**Screenshots**
24+
If applicable, add screenshots to help explain your problem.
25+
26+
**Version info (please complete the following information):**
27+
- Heimdall:
28+
- Docker, if applicable: [e.g. chrome, safari]
29+
- App:
30+
- Version of remote application App tries to use:
31+
32+
**Additional context**
33+
Add any other context about the problem here.

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for an enhanced app or change to one
4+
title: "[FEAT] - <your summary here>"
5+
labels: enhancement
6+
assignees: ''
7+
8+
---
9+
10+
**NOTE - If you simply want to request the addition of an app to Heimdall, read https://github.com/linuxserver/Heimdall-Apps/wiki/Requesting-Apps**
11+
12+
**Describe the what you'd like to have changed**
13+
A clear and concise description of what you want to happen.
14+
15+
**Describe alternatives you've considered**
16+
A clear and concise description of any alternative solutions you've considered.
17+
18+
**Additional context**
19+
Add any other context or screenshots about the feature request here.
20+
21+
**Are you willing to create a PR yourself?**
22+
Are you willing to help make this change happen by creating a PR, assuming that a maintainer OKs the proposed change?

‎.github/workflows/call_issue_pr_tracker.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Issue & PR Tracker
2+
3+
on:
4+
issues:
5+
types: [opened,reopened,labeled,unlabeled,closed]
6+
pull_request_target:
7+
types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled,closed]
8+
pull_request_review:
9+
types: [submitted,edited,dismissed]
10+
11+
jobs:
12+
manage-project:
13+
permissions:
14+
issues: write
15+
uses: linuxserver/github-workflows/.github/workflows/issue-pr-tracker.yml@v1
16+
secrets: inherit

‎.github/workflows/call_issues_cron.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Mark stale issues and pull requests
2+
on:
3+
#schedule:
4+
# - cron: '14 15 * * *'
5+
workflow_dispatch:
6+
7+
jobs:
8+
stale:
9+
permissions:
10+
issues: write
11+
pull-requests: write
12+
uses: linuxserver/github-workflows/.github/workflows/issues-cron.yml@v1
13+
secrets: inherit

‎.github/workflows/linter.yml‎

Lines changed: 74 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,75 @@
11
---
2-
#################################
3-
#################################
4-
## Super Linter GitHub Actions ##
5-
#################################
6-
#################################
7-
name: Lint Code Base
8-
9-
#
10-
# Documentation:
11-
# https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions
12-
#
13-
14-
#############################
15-
# Start the job on all push #
16-
#############################
17-
on:
18-
push:
19-
# Remove the line above to run when pushing to master
20-
pull_request:
21-
22-
###############
23-
# Set the Job #
24-
###############
25-
jobs:
26-
build:
27-
# Name the Job
28-
name: Lint Code Base
29-
# Set the agent to run on
30-
runs-on: ubuntu-latest
31-
32-
##################
33-
# Load all steps #
34-
##################
35-
steps:
36-
##########################
37-
# Checkout the code base #
38-
##########################
39-
- name: Checkout Code
40-
uses: actions/checkout@v3
41-
with:
42-
# Full git history is needed to get a proper list of changed files within `super-linter`
43-
fetch-depth: 0
44-
45-
################################
46-
# Run Linter against code base #
47-
################################
48-
- name: Lint Code Base
49-
uses: github/super-linter@v4
50-
env:
51-
VALIDATE_ALL_CODEBASE: false
52-
# Change to 'master' if your main branch differs
53-
DEFAULT_BRANCH: main
54-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2+
name: lint
3+
4+
on:
5+
push:
6+
branches:
7+
- 'master'
8+
- 'releases/**'
9+
pull_request:
10+
types: [opened, edited, synchronize, reopened, review_requested]
11+
12+
jobs:
13+
php-lint:
14+
name: PHP lint 8.2
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Checkout
18+
uses: actions/checkout@v5
19+
20+
- name: PHP syntax checker 8.2
21+
uses: prestashop/github-action-php-lint/8.2@master
22+
23+
# phpmd:
24+
# name: PHPMD
25+
# runs-on: ubuntu-latest
26+
# steps:
27+
# - name: Checkout
28+
# uses: actions/checkout@v5
29+
#
30+
# - name: PHP Mess Detector
31+
# uses: php-actions/phpmd@v1
32+
# with:
33+
# php_version: 8.2
34+
# path: ./
35+
# output: text
36+
# ruleset: test/phpmd/ruleset.xml
37+
38+
phpcs:
39+
name: PHPCS
40+
runs-on: ubuntu-latest
41+
steps:
42+
- name: Checkout
43+
uses: actions/checkout@v5
44+
45+
- name: PHP Code Sniffer
46+
uses: php-actions/phpcs@v1
47+
with:
48+
php_version: 8.2
49+
path: ./
50+
standard: PSR12
51+
ignore: livestats.blade.php,config.blade.php,.js
52+
exclude: Squiz.Functions.MultiLineFunctionDeclaration
53+
54+
# Figure out later what the correct paths for Heimdall src should be.
55+
# Needed by PHPStan for symbol discovery.
56+
#
57+
# phpstan:
58+
# name: PHPStan
59+
# runs-on: ubuntu-latest
60+
# steps:
61+
# - name: Checkout
62+
# uses: actions/checkout@v5
63+
# with:
64+
# path: src
65+
#
66+
# - name: Checkout Heimdall repo for dependencies
67+
# uses: actions/checkout@v5
68+
# with:
69+
# repository: linuxserver/Heimdall
70+
# path: ./heimdall-src
71+
#
72+
# - uses: php-actions/phpstan@v3
73+
# with:
74+
# path: src/
75+
# configuration: src/phpstan.neon

‎.github/workflows/main.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
name: Deploy to GitHub Pages
23

34
on:
@@ -11,14 +12,14 @@ jobs:
1112
strategy:
1213
matrix:
1314
os: [ubuntu-latest]
14-
node: [14]
15+
node: [20]
1516

1617
steps:
1718
- name: Checkout
18-
uses: actions/checkout@v3
19+
uses: actions/checkout@v5
1920

2021
- name: Setup node env
21-
uses: actions/setup-node@v3.6.0
22+
uses: actions/setup-node@v5
2223
with:
2324
node-version: ${{ matrix.node }}
2425

@@ -29,7 +30,7 @@ jobs:
2930
run: node index.js
3031

3132
- name: Deploy
32-
uses: peaceiris/actions-gh-pages@v3
33+
uses: peaceiris/actions-gh-pages@v4
3334
with:
3435
github_token: ${{ secrets.GITHUB_TOKEN }}
3536
publish_dir: ./dist

‎.github/workflows/prchecks.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
name: PR Checks
23

34
on:
@@ -12,14 +13,14 @@ jobs:
1213
strategy:
1314
matrix:
1415
os: [ubuntu-latest]
15-
node: [18]
16+
node: [20]
1617

1718
steps:
1819
- name: Checkout
19-
uses: actions/checkout@v3
20+
uses: actions/checkout@v5
2021

2122
- name: Setup node env
22-
uses: actions/setup-node@v3.6.0
23+
uses: actions/setup-node@v5
2324
with:
2425
node-version: ${{ matrix.node }}
2526

‎.github/workflows/svgo.config.js‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
// svgo.config.js
22
module.exports = {
3-
multipass: true, // boolean. false by default
4-
js2svg: {
5-
indent: 4, // string with spaces or number of spaces. 4 by default
6-
pretty: false, // boolean, false by default
7-
},
8-
plugins: [
9-
// set of built-in plugins enabled by default
10-
"preset-default",
3+
multipass: true, // boolean. false by default
4+
js2svg: {
5+
indent: 4, // string with spaces or number of spaces. 4 by default
6+
pretty: false, // boolean, false by default
7+
},
8+
plugins: [
9+
// set of built-in plugins enabled by default
10+
"preset-default",
1111

12-
// enable built-in plugins by name
13-
"removeDimensions",
12+
// enable built-in plugins by name
13+
"removeDimensions",
1414

15-
// or by expanded notation which allows to configure plugin
16-
{
17-
name: "sortAttrs",
18-
params: {
19-
xmlnsOrder: "alphabetical",
20-
},
21-
},
22-
],
15+
// or by expanded notation which allows to configure plugin
16+
{
17+
name: "sortAttrs",
18+
params: {
19+
xmlnsOrder: "alphabetical",
20+
},
21+
},
22+
],
2323
};

‎.github/workflows/svgo.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
# GitHub Action uses SVGO to Minify and removeDimensions of SVG files
23
name: Optimize SVG Files
34

@@ -14,15 +15,15 @@ jobs:
1415
runs-on: ubuntu-latest
1516
steps:
1617
- name: Checkout repository
17-
uses: actions/checkout@v3
18+
uses: actions/checkout@v5
1819
- name: Optimize SVGs
19-
uses: ericcornelissen/svgo-action@v3
20+
uses: ericcornelissen/svgo-action@v4
2021
id: svgo
2122
with:
2223
repo-token: ${{secrets.GITHUB_TOKEN}}
2324
svgo-config: .github/workflows/svgo.config.js
2425
- name: Commit optimizations
25-
uses: stefanzweifel/git-auto-commit-action@v4
26+
uses: stefanzweifel/git-auto-commit-action@v6
2627
if: ${{steps.svgo.outputs.DID_OPTIMIZE}}
2728
with:
28-
commit_message: Optimize ${{steps.svgo.outputs.OPTIMIZED_COUNT}} SVG(s)
29+
commit_message: Optimize ${{steps.svgo.outputs.OPTIMIZED_COUNT}} SVG(s) # yamllint disable-line rule:line-length

0 commit comments

Comments
 (0)