Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/ShivamAmin/Kavita into f…
Browse files Browse the repository at this point in the history
…eature/book-reader-swipe-pagination
  • Loading branch information
ShivamAmin committed Apr 6, 2024
2 parents 178d03e + 57fb2d0 commit 698f16d
Show file tree
Hide file tree
Showing 382 changed files with 47,866 additions and 5,317 deletions.
62 changes: 21 additions & 41 deletions .github/DISCUSSION_TEMPLATE/ideas.yml
Original file line number Diff line number Diff line change
@@ -1,68 +1,48 @@
title: "[Kavita] Idea Submission"
labels: ["Idea Submission"]
title: "[Kavita] Idea / Feature Submission"
labels:
- "Idea Submission"
body:
- type: markdown
attributes:
value: |
## 🌟 Idea Submission for Kavita 🌟
This is a template for submitting your ideas to enhance Kavita. Please fill out the details below, and let's make Kavita even better together!
## Idea Submission for Kavita 💡
Please fill out the details below, and let's make Kavita even better together!
- type: textarea
id: idea-description
attributes:
label: Idea Description
description: "Describe your idea in detail."
value: |
[Include a brief overview of your idea]
- type: markdown
attributes:
value: |
**Why I Think This Is Important:**
[Provide context on why you believe this idea is valuable or necessary for Kavita users]
- type: markdown
attributes:
value: |
**How You Can Contribute:**
1. **Upvote if You Agree:**
- If you resonate with my idea, please upvote it! This helps us gauge community interest.
2. **Leave Your Thoughts:**
- Feel free to leave comments with your opinions, suggestions, or even constructive critiques.
Let's work together to shape the future of Kavita! 🌟
- type: input
id: duration-of-use
attributes:
label: Duration of Using Kavita
description: "How long have you been using Kavita?"
validations:
required: true

Go into as much detail as possible to explain why your idea should be added to Kavita. Try to present some use cases and examples of how it would help other users. The more detail you have the better.
- type: dropdown
id: idea-category
attributes:
label: Idea Category
options:
- API
- Feature Enhancement
- User Experience
- Performance Improvement
description: "Select the category that best fits your idea."
- Web UI
description: "What area would your idea help with?"
validations:
required: true


- type: input
id: duration-of-use
attributes:
label: Duration of Using Kavita
description: "How long have you been using Kavita?"

- type: checkboxes
attributes:
label: Agreement
label: Before submitting
options:
- label: "I agree that this is solely for submitting ideas, and I will search for existing ideas before posting."
- label: "I've already searched for existing ideas before posting."
required: true

- type: markdown
attributes:
value: |
Expand Down
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ body:
label: Kavita Version Number - Don't see your version number listed? Then your install is out of date. Please update and see if your issue still persists.
multiple: false
options:
- 0.7.13 - Stable
- 0.7.14 - Stable
- Nightly Testing Branch
validations:
required: true
Expand Down Expand Up @@ -75,13 +75,13 @@ body:
- type: dropdown
id: mobile-browsers
attributes:
label: If the issue is being seen on the UI, what browsers are you seeing the problem on?
label: If the issue is being seen on the Mobile UI, what browsers are you seeing the problem on?
multiple: true
options:
- Firefox
- Chrome
- Safari
- Microsoft Edge
- Other iOS Browser
- type: textarea
id: logs
attributes:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ jobs:
runs-on: windows-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup .NET Core
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x

Expand All @@ -26,7 +26,7 @@ jobs:
- name: Install dependencies
run: dotnet restore

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: csproj
path: Kavita.Common/Kavita.Common.csproj
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/canary-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: csproj
path: Kavita.Common/Kavita.Common.csproj
Expand All @@ -26,12 +26,12 @@ jobs:
needs: [ build ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup .NET Core
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x

Expand Down Expand Up @@ -59,14 +59,14 @@ jobs:
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: Check Out Repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: canary

- name: NodeJS to Compile WebUI
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '18.13.x'
node-version: 20
- run: |
cd UI/Web || exit
echo 'Installing web dependencies'
Expand All @@ -81,7 +81,7 @@ jobs:
cd ../ || exit
- name: Get csproj Version
uses: kzrnm/get-net-sdk-project-versions-action@v1
uses: kzrnm/get-net-sdk-project-versions-action@v2
id: get-version
with:
proj-path: Kavita.Common/Kavita.Common.csproj
Expand All @@ -96,7 +96,7 @@ jobs:
run: echo "${{steps.get-version.outputs.assembly-version}}"

- name: Compile dotnet app
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x

Expand All @@ -106,28 +106,28 @@ jobs:
- run: ./monorepo-build.sh

- name: Login to Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}

- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Build and push
id: docker_build
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
platforms: linux/amd64,linux/arm/v7,linux/arm64
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Swashbuckle CLI
shell: bash
Expand Down
37 changes: 17 additions & 20 deletions .github/workflows/develop-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@ name: Nightly Workflow

on:
push:
branches: ['!release/**']
pull_request:
branches: [ 'develop', '!release/**' ]
types: [ closed ]
workflow_dispatch:

jobs:
Expand All @@ -21,14 +18,14 @@ jobs:
build:
name: Upload Kavita.Common for Version Bump
runs-on: ubuntu-latest
if: github.event.pull_request.merged == true && !contains(github.head_ref, 'release')
if: github.ref == 'refs/heads/develop'
steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: csproj
path: Kavita.Common/Kavita.Common.csproj
Expand All @@ -37,14 +34,14 @@ jobs:
name: Bump version
needs: [ build ]
runs-on: ubuntu-latest
if: github.event.pull_request.merged == true && !contains(github.head_ref, 'release')
if: github.ref == 'refs/heads/develop'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup .NET Core
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x

Expand All @@ -59,7 +56,7 @@ jobs:
name: Build Nightly Docker
needs: [ build, version ]
runs-on: ubuntu-latest
if: github.event.pull_request.merged == true && !contains(github.head_ref, 'release')
if: github.ref == 'refs/heads/develop'
permissions:
packages: write
contents: read
Expand Down Expand Up @@ -92,14 +89,14 @@ jobs:
echo "BODY=$body" >> $GITHUB_OUTPUT
- name: Check Out Repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: develop

- name: NodeJS to Compile WebUI
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '18.13.x'
node-version: 20
- run: |
cd UI/Web || exit
echo 'Installing web dependencies'
Expand All @@ -114,7 +111,7 @@ jobs:
cd ../ || exit
- name: Get csproj Version
uses: kzrnm/get-net-sdk-project-versions-action@v1
uses: kzrnm/get-net-sdk-project-versions-action@v2
id: get-version
with:
proj-path: Kavita.Common/Kavita.Common.csproj
Expand All @@ -129,7 +126,7 @@ jobs:
run: echo "${{steps.get-version.outputs.assembly-version}}"

- name: Compile dotnet app
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x

Expand All @@ -139,28 +136,28 @@ jobs:
- run: ./monorepo-build.sh

- name: Login to Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}

- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Build and push
id: docker_build
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
platforms: linux/amd64,linux/arm/v7,linux/arm64
Expand Down
Loading

0 comments on commit 698f16d

Please sign in to comment.