aboutsummaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorNick <20588554+nicknsy@users.noreply.github.com>2023-10-18 19:27:05 -0700
committerNick <20588554+nicknsy@users.noreply.github.com>2023-10-18 19:27:05 -0700
commitcd662506a1f63f9b20e7f5caa9b671eb3d71ea5a (patch)
treeb58f7158e21e7ed21d77b0f0abfce23d796b3fe3 /.github
parentc7feea27fde8af60984c8fe41444dc245dbde395 (diff)
parentde08d38a6f2a6e773fa1000574e08322605b56d3 (diff)
Merge branch 'master' into trickplay
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/codeql-analysis.yml8
-rw-r--r--.github/workflows/commands.yml4
-rw-r--r--.github/workflows/openapi.yml8
-rw-r--r--.github/workflows/repo-bump-version.yaml82
-rw-r--r--.github/workflows/repo-stale.yaml13
5 files changed, 99 insertions, 16 deletions
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index f83b38949..a5f36eab4 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -20,18 +20,18 @@ jobs:
steps:
- name: Checkout repository
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+ uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Setup .NET
uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
with:
dotnet-version: '7.0.x'
- name: Initialize CodeQL
- uses: github/codeql-action/init@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # v2.20.1
+ uses: github/codeql-action/init@0116bc2df50751f9724a2e35ef1f24d22f90e4e1 # v2.22.3
with:
languages: ${{ matrix.language }}
queries: +security-extended
- name: Autobuild
- uses: github/codeql-action/autobuild@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # v2.20.1
+ uses: github/codeql-action/autobuild@0116bc2df50751f9724a2e35ef1f24d22f90e4e1 # v2.22.3
- name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # v2.20.1
+ uses: github/codeql-action/analyze@0116bc2df50751f9724a2e35ef1f24d22f90e4e1 # v2.22.3
diff --git a/.github/workflows/commands.yml b/.github/workflows/commands.yml
index 178959afc..8055438b5 100644
--- a/.github/workflows/commands.yml
+++ b/.github/workflows/commands.yml
@@ -24,7 +24,7 @@ jobs:
reactions: '+1'
- name: Checkout the latest code
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+ uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
token: ${{ secrets.JF_BOT_TOKEN }}
fetch-depth: 0
@@ -51,7 +51,7 @@ jobs:
reactions: eyes
- name: Checkout the latest code
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+ uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
token: ${{ secrets.JF_BOT_TOKEN }}
fetch-depth: 0
diff --git a/.github/workflows/openapi.yml b/.github/workflows/openapi.yml
index d3dfd0a6a..c267fdcc2 100644
--- a/.github/workflows/openapi.yml
+++ b/.github/workflows/openapi.yml
@@ -14,7 +14,7 @@ jobs:
permissions: read-all
steps:
- name: Checkout repository
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+ uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
ref: ${{ github.event.pull_request.head.sha }}
repository: ${{ github.event.pull_request.head.repo.full_name }}
@@ -25,7 +25,7 @@ jobs:
- name: Generate openapi.json
run: dotnet test tests/Jellyfin.Server.Integration.Tests/Jellyfin.Server.Integration.Tests.csproj -c Release --filter "Jellyfin.Server.Integration.Tests.OpenApiSpecTests"
- name: Upload openapi.json
- uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+ uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
with:
name: openapi-head
retention-days: 14
@@ -39,7 +39,7 @@ jobs:
permissions: read-all
steps:
- name: Checkout repository
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+ uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
ref: ${{ github.event.pull_request.head.sha }}
repository: ${{ github.event.pull_request.head.repo.full_name }}
@@ -59,7 +59,7 @@ jobs:
- name: Generate openapi.json
run: dotnet test tests/Jellyfin.Server.Integration.Tests/Jellyfin.Server.Integration.Tests.csproj -c Release --filter "Jellyfin.Server.Integration.Tests.OpenApiSpecTests"
- name: Upload openapi.json
- uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+ uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
with:
name: openapi-base
retention-days: 14
diff --git a/.github/workflows/repo-bump-version.yaml b/.github/workflows/repo-bump-version.yaml
new file mode 100644
index 000000000..e0383afd2
--- /dev/null
+++ b/.github/workflows/repo-bump-version.yaml
@@ -0,0 +1,82 @@
+name: '🆙 Auto bump_version'
+
+on:
+ release:
+ types:
+ - published
+ workflow_dispatch:
+ inputs:
+ TAG_BRANCH:
+ required: true
+ description: release-x.y.z
+ NEXT_VERSION:
+ required: true
+ description: x.y.z
+
+jobs:
+ auto_bump_version:
+ runs-on: ubuntu-latest
+ if: ${{ github.event_name == 'release' && !contains(github.event.release.tag_name, 'rc') }}
+ env:
+ TAG_BRANCH: ${{ github.event.release.target_commitish }}
+ steps:
+ - name: Wait for deploy checks to finish
+ uses: jitterbit/await-check-suites@292a541bb7618078395b2ce711a0d89cfb8a568a # v1
+ with:
+ ref: ${{ env.TAG_BRANCH }}
+ intervalSeconds: 60
+ timeoutSeconds: 3600
+
+ - name: Setup YQ
+ uses: chrisdickinson/setup-yq@latest
+ with:
+ yq-version: v4.9.8
+
+ - name: Checkout Repository
+ uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+ with:
+ ref: ${{ env.TAG_BRANCH }}
+
+ - name: Setup EnvVars
+ run: |-
+ CURRENT_VERSION=$(yq e '.version' build.yaml)
+ CURRENT_MAJOR_MINOR=${CURRENT_VERSION%.*}
+ CURRENT_PATCH=${CURRENT_VERSION##*.}
+ echo "CURRENT_VERSION=${CURRENT_VERSION}" >> $GITHUB_ENV
+ echo "CURRENT_MAJOR_MINOR=${CURRENT_MAJOR_MINOR}" >> $GITHUB_ENV
+ echo "CURRENT_PATCH=${CURRENT_PATCH}" >> $GITHUB_ENV
+ echo "NEXT_VERSION=${CURRENT_MAJOR_MINOR}.$(($CURRENT_PATCH + 1))" >> $GITHUB_ENV
+
+ - name: Run bump_version
+ run: ./bump_version ${{ env.NEXT_VERSION }}
+
+ - name: Commit Changes
+ run: |-
+ git config user.name "jellyfin-bot"
+ git config user.email "team@jellyfin.org"
+ git checkout ${{ env.TAG_BRANCH }}
+ git commit -am "Bump version to ${{ env.NEXT_VERSION }}"
+ git push origin ${{ env.TAG_BRANCH }}
+
+ manual_bump_version:
+ runs-on: ubuntu-latest
+ if: ${{ github.event_name == 'workflow_dispatch' }}
+ env:
+ TAG_BRANCH: ${{ github.event.inputs.TAG_BRANCH }}
+ NEXT_VERSION: ${{ github.event.inputs.NEXT_VERSION }}
+ steps:
+ - name: Checkout Repository
+ uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+ with:
+ ref: ${{ env.TAG_BRANCH }}
+
+ - name: Run bump_version
+ run: ./bump_version ${{ env.NEXT_VERSION }}
+
+ - name: Commit Changes
+ run: |-
+ git config user.name "jellyfin-bot"
+ git config user.email "team@jellyfin.org"
+ git checkout ${{ env.TAG_BRANCH }}
+ git commit -am "Bump version to ${{ env.NEXT_VERSION }}"
+ git push origin ${{ env.TAG_BRANCH }}
diff --git a/.github/workflows/repo-stale.yaml b/.github/workflows/repo-stale.yaml
index c753c1600..2b1164116 100644
--- a/.github/workflows/repo-stale.yaml
+++ b/.github/workflows/repo-stale.yaml
@@ -2,16 +2,17 @@ name: Stale Check
on:
schedule:
- - cron: '30 1 * * *'
+ - cron: '30 */12 * * *'
workflow_dispatch:
permissions:
issues: write
pull-requests: write
+ actions: write
jobs:
issues:
- name: Check issues
+ name: Check for stale issues
runs-on: ubuntu-latest
if: ${{ contains(github.repository, 'jellyfin/') }}
steps:
@@ -26,11 +27,11 @@ jobs:
exempt-issue-labels: regression,security,roadmap,future,feature,enhancement,confirmed
stale-issue-label: stale
stale-issue-message: |-
- This issue has gone 120 days without comment. To avoid abandoned issues, it will be closed in 21 days if there are no new comments.
+ This issue has gone 120 days without an update and will be closed within 21 days if there is no new activity. To prevent this issue from being closed, please confirm the issue has not already been fixed by providing updated examples or logs.
- If you're the original submitter of this issue, please comment confirming if this issue still affects you in the latest release or master branch, or close the issue if it has been fixed. If you're another user also affected by this bug, please comment confirming so. Either action will remove the stale label.
-
- This bot exists to prevent issues from becoming stale and forgotten. Jellyfin is always moving forward, and bugs are often fixed as side effects of other changes. We therefore ask that bug report authors remain vigilant about their issues to ensure they are closed if fixed, or re-confirmed - perhaps with fresh logs or reproduction examples - regularly. If you have any questions you can reach us on [Matrix or Social Media](https://docs.jellyfin.org/general/getting-help.html).
+ If you have any questions you can use one of several ways to [contact us](https://jellyfin.org/contact).
+ close-issue-message: |-
+ This issue was closed due to inactivity.
prs-conflicts:
name: Check PRs with merge conflicts