Skip to content

Commit

Permalink
Merge branch 'master' into only-run-workflows-once
Browse files Browse the repository at this point in the history
  • Loading branch information
cewert authored Jul 25, 2024
2 parents 55e301b + 1463210 commit 809349a
Show file tree
Hide file tree
Showing 13 changed files with 177 additions and 106 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/auto-close-stale-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
days-before-issue-stale: -1
days-before-issue-close: -1
stale-pr-label: stale
stale-pr-message: "This pull request has been inactive for 21 days and will be automatically closed in 7 days if there is no further activity."
close-pr-message: "This pull request has been closed because it has been inactive for 28 days. You may submit a new pull request if desired."
days-before-pr-stale: 21
days-before-pr-close: 7
stale-pr-message: "This pull request has been inactive for 30 days and will be automatically closed in 15 days if there is no further activity."
close-pr-message: "This pull request has been closed because it has been inactive for 45 days. You may submit a new pull request if desired."
days-before-pr-stale: 30
days-before-pr-close: 15
exempt-draft-pr: true
repo-token: ${{ secrets.JF_BOT_TOKEN }}
6 changes: 3 additions & 3 deletions .github/workflows/bump-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
git add .
git commit -m "Bump ${{ github.event.inputs.versionType }} version"
git push --set-upstream origin "${{ env.newBranch }}"
gh pr create --title "Bump ${{ github.event.inputs.targetBranch }} branch to ${{ env.newVersion }}" --body "Bump version to prep for next release." --label ignore-changelog --base ${{ env.targetBranch }}
gh pr create --title "Bump ${{ github.event.inputs.targetBranch }} branch to ${{ env.newVersion }}" --body "Bump version to prep for next release. Generated by `.github/workflows/bump-version.yml`" --label ignore-changelog --base ${{ env.targetBranch }}
minor:
if: ${{ github.event.inputs.versionType == 'minor' }}
runs-on: ubuntu-latest
Expand Down Expand Up @@ -161,7 +161,7 @@ jobs:
git add .
git commit -m "Bump ${{ github.event.inputs.versionType }} version"
git push --set-upstream origin "${{ env.newBranch }}"
gh pr create --title "Bump ${{ github.event.inputs.targetBranch }} branch to ${{ env.newVersion }}" --body "Bump version to prep for next release." --label ignore-changelog --base ${{ env.targetBranch }}
gh pr create --title "Bump ${{ github.event.inputs.targetBranch }} branch to ${{ env.newVersion }}" --body "Bump version to prep for next release. Generated by `.github/workflows/bump-version.yml`" --label ignore-changelog --base ${{ env.targetBranch }}
major:
if: ${{ github.event.inputs.versionType == 'major' }}
Expand Down Expand Up @@ -231,5 +231,5 @@ jobs:
git add .
git commit -m "Bump ${{ github.event.inputs.versionType }} version"
git push --set-upstream origin "${{ env.newBranch }}"
gh pr create --title "Bump ${{ github.event.inputs.targetBranch }} branch to ${{ env.newVersion }}" --body "Bump version to prep for next release." --label ignore-changelog --base ${{ env.targetBranch }}
gh pr create --title "Bump ${{ github.event.inputs.targetBranch }} branch to ${{ env.newVersion }}" --body "Bump version to prep for next release. Generated by `.github/workflows/bump-version.yml`" --label ignore-changelog --base ${{ env.targetBranch }}
20 changes: 20 additions & 0 deletions .github/workflows/lint-brightscript.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: lint-brightscript
on:
pull_request:
paths:
- "**/*.brs"
- "**/*.bs"

jobs:
run:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- uses: actions/setup-node@master
with:
node-version: "lts/*"
cache: "npm"
- run: npm ci
- run: npx ropm install
- run: npm run validate
- run: npm run check-formatting
23 changes: 23 additions & 0 deletions .github/workflows/lint-json.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: lint-json
on:
pull_request:
paths:
- "!docs/api/**"
- "**/*.json"

jobs:
run:
runs-on: ubuntu-latest
steps:
- name: Clone github repo
uses: actions/checkout@master
- uses: actions/setup-node@master
with:
node-version: "lts/*"
cache: "npm"
- name: Install npm dependencies
run: npm ci
- name: Install roku package dependencies
run: npx ropm install
- name: Validate JSON syntax
run: npm run lint-json
23 changes: 23 additions & 0 deletions .github/workflows/lint-markdown.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: lint-markdown
on:
pull_request:
paths:
- "**/*.md"

jobs:
run:
runs-on: ubuntu-latest
steps:
- name: Clone github repo
uses: actions/checkout@master
- uses: actions/setup-node@master
with:
node-version: "lts/*"
cache: "npm"
- name: Install npm dependencies
run: npm ci
- name: Install roku package dependencies
run: npx ropm install
- uses: xt0rted/markdownlint-problem-matcher@1a5fabfb577370cfdf5af944d418e4be3ea06f27 # v3
- name: Lint markdown files
run: npm run lint-markdown
22 changes: 22 additions & 0 deletions .github/workflows/lint-spelling.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: lint-spelling
on:
pull_request:
paths:
- "**/*.md"

jobs:
run:
runs-on: ubuntu-latest
steps:
- name: Clone github repo
uses: actions/checkout@master
- uses: actions/setup-node@master
with:
node-version: "lts/*"
cache: "npm"
- name: Install npm dependencies
run: npm ci
- name: Install roku package dependencies
run: npx ropm install
- name: Check markdown files for spelling errors
run: npm run lint-spelling
25 changes: 25 additions & 0 deletions .github/workflows/lint-translation-files.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: lint-translation-files
on:
pull_request:
paths:
- "locale/*/*.ts"

jobs:
run:
runs-on: ubuntu-latest
steps:
- name: Clone github repo
uses: actions/checkout@master
- name: Install xmllint and xmlstarlet using apt (from cache)
uses: awalsh128/cache-apt-pkgs-action@latest
with:
packages: libxml2-utils xmlstarlet
- name: Validate XML syntax
run: xmllint --noout ./locale/en_US/translations.ts
- name: Save output of duplicate check
run: echo "tsDuplicates=$(xmlstarlet sel -t -m '/TS/context/message/source' -c '.' -nl ./locale/en_US/translations.ts | sort | uniq -d | awk '{ printf "%s", $0 }')" >> $GITHUB_ENV
- name: Check for duplicates
run: xmlstarlet sel -t -m '/TS/context/message/source' -f -o ' ' -c '.' -nl ./locale/en_US/translations.ts | sort | uniq -d
- name: Duplicates found
if: env.tsDuplicates != ''
run: exit 1
81 changes: 0 additions & 81 deletions .github/workflows/lint.yml

This file was deleted.

1 change: 0 additions & 1 deletion .github/workflows/roku-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: roku-analysis

on:
pull_request:
push:

env:
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
Expand Down
20 changes: 20 additions & 0 deletions locale/de_DE/translations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1288,6 +1288,26 @@
<translation>Die Quelldatei ist mit diesem Client vollständig kompatibel und die Sitzung empfängt die Datei ohne Änderungen.</translation>
<extracomment>Direct play info box text in GetPlaybackInfoTask.brs</extracomment>
</message>
<message>
<source>Welcome to version</source>
<translation>Willkommen bei der Version</translation>
<extracomment>WhatsNewDialog title - Welcome to version 2.0.0</extracomment>
</message>
<message>
<source>To view a complete list of changes visit</source>
<translation>Eine vollständige Liste der Änderungen findest du unter</translation>
<extracomment>WhatsNewDialog body text preceding the changelog URL</extracomment>
</message>
<message>
<source>Rewatching Next Up</source>
<translation>Als nächstes noch einmal ansehen</translation>
<extracomment>User Setting - Setting title</extracomment>
</message>
<message>
<source>Show already watched episodes in &apos;Next Up&apos; sections.</source>
<translation>Zeige bereits gesehene Episoden in der Rubrik &apos;Nächste Folge&apos; an.</translation>
<extracomment>User Setting - Setting description</extracomment>
</message>
</context>
<context>
<name></name>
Expand Down
20 changes: 20 additions & 0 deletions locale/en_GB/translations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1264,6 +1264,26 @@
<translation>Ratings for how good a movie is</translation>
<extracomment>User Setting - Setting description</extracomment>
</message>
<message>
<source>Rewatching Next Up</source>
<translation>Rewatching Next Up</translation>
<extracomment>User Setting - Setting title</extracomment>
</message>
<message>
<source>Welcome to version</source>
<translation>Welcome to version</translation>
<extracomment>WhatsNewDialog title - Welcome to version 2.0.0</extracomment>
</message>
<message>
<source>To view a complete list of changes visit</source>
<translation>To view a complete list of changes visit</translation>
<extracomment>WhatsNewDialog body text preceding the changelog URL</extracomment>
</message>
<message>
<source>Show already watched episodes in &apos;Next Up&apos; sections.</source>
<translation>Show already watched episodes in &apos;Next Up&apos; sections.</translation>
<extracomment>User Setting - Setting description</extracomment>
</message>
</context>
<context>
<name></name>
Expand Down
28 changes: 14 additions & 14 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"description": "Roku app for Jellyfin media server",
"dependencies": {
"@rokucommunity/bslib": "0.1.1",
"brighterscript-formatter": "1.7.3",
"brighterscript-formatter": "1.7.4",
"log": "npm:[email protected]"
},
"devDependencies": {
"@rokucommunity/bslint": "0.8.21",
"brighterscript": "0.67.3",
"@rokucommunity/bslint": "0.8.22",
"brighterscript": "0.67.4",
"brighterscript-jsdocs-plugin": "0.6.0",
"clean-jsdoc-theme": "4.3.0",
"jsdoc": "4.0.3",
Expand Down

0 comments on commit 809349a

Please sign in to comment.