Skip to content

Commit

Permalink
Merge pull request #238 from nzbgetcom/develop
Browse files Browse the repository at this point in the history
v24.0
  • Loading branch information
dnzbk committed Apr 25, 2024
2 parents c116a63 + a5940a6 commit 466b8b6
Show file tree
Hide file tree
Showing 134 changed files with 6,911 additions and 2,215 deletions.
85 changes: 85 additions & 0 deletions .github/ISSUE_TEMPLATE/01_bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
name: Bug Report
description: 'Any bug about core nzbget, EXCLUDING extensions, performance issues or compiling nzbget.'
labels: ['bug']
body:
- type: checkboxes
attributes:
label: Is there already an issue for your problem?
description: Please make sure you are not creating an already submitted <a href="https://github.com/nzbgetcom/nzbget/issues">Issue</a>. Check closed issues as well, because your issue may have already been fixed.
options:
- label: I have checked older issues, open and closed
required: true
- type: dropdown
attributes:
label: NZBGet Version
description: Which version of NZBGet has this bug?
options:
- v23-stable
- v23-testing
- v22-stable (nzbgetcom takeover)
- v22-testing (nzbgetcom takeover)
- v21 or earlier (orignal nzbget)
validations:
required: true
- type: dropdown
attributes:
label: Platform
description: Select a specific platform for this bug report, choose All if it applies to all platforms
options:
- All
- Windows
- macOS
- NAS/Synology/QNAP
- Linux/Docker
validations:
required: true
- type: textarea
attributes:
label: Environment
description: Please provide the details of the system NZBGet is running on. The more information you can provide, the better
placeholder: |
Device:
OS version: platform n.nn (32bit/64bit)
CPU architecture: (32bit/64bit)
Includes libs or tool that apply: 7zip x.x, unrar x.x, python3.11
Running in Docker: No/Yes
render: markdown
validations:
required: true
- type: textarea
attributes:
label: Current Behavior
description: A concise description of what you're experiencing.
validations:
required: true
- type: textarea
attributes:
label: Expected Behavior
description: A concise description of what you expected to happen.
validations:
required: true
- type: textarea
attributes:
label: Steps To Reproduce
description: Steps to reproduce the behavior.
placeholder: |
1. In this environment...
2. With this config...
3. Run '...'
4. See error...
validations:
required: false
- type: textarea
attributes:
label: Logs
description: |
Any logs or messages that apply
validations:
required: false
- type: textarea
attributes:
label: Extra information
description: |
Please refer to any extra information - extra documentation, attach files or images
validations:
required: false
36 changes: 36 additions & 0 deletions .github/ISSUE_TEMPLATE/02_feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Feature Request
description: 'Feature requests or small enhancements'
labels: ['enhancement']
body:
- type: checkboxes
attributes:
label: Is there already an issue for this request?
description: Please make sure you are not creating an already submitted <a href="https://github.com/nzbgetcom/nzbget/issues">Issue</a>. Check closed issues as well, because your issue could have been resolved and waiting to be released.
options:
- label: I have checked older issues, open and closed
required: true
- type: dropdown
attributes:
label: Platform
description: Select a specific platform for this request, choose All if it applies to all platforms
options:
- All
- Windows
- macOS
- NAS/Synology/QNAP
- Linux/Docker
validations:
required: true
- type: textarea
attributes:
label: Describe the enhancement you'd like
description: A clear and concise description of what you want to happen.
validations:
required: true
- type: textarea
attributes:
label: Extra information
description: |
Please refer to any extra information - competing product(s) and/or features, extra documentation, attach files or images
validations:
required: false
71 changes: 71 additions & 0 deletions .github/ISSUE_TEMPLATE/03_build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
name: Building, compiling, contributing
description: 'Problems building nzbget or questions about contributing'
labels: ['question']
body:
- type: dropdown
attributes:
label: NZBGet Version
description: Version of NZBGet for the scope of this issue
options:
- v23-stable
- v23-testing
- v22-stable (nzbgetcom takeover)
- v22-testing (nzbgetcom takeover)
- v21 or earlier (orignal nzbget)
validations:
required: true
- type: dropdown
attributes:
label: Platform
description: Select a specific platform for this issue, choose All if it applies to all platforms
options:
- All
- Windows
- macOS
- NAS/Synology/QNAP
- Linux/Docker
validations:
required: true
- type: textarea
attributes:
label: Environment
description: Please provide the details of the system where the issue is observed
placeholder: |
Device:
OS version: platform n.nn (32bit/64bit)
CPU architecture: (32bit/64bit)
Includes libs or tool that apply: 7zip x.x, unrar x.x, python3.11
render: markdown
validations:
required: true
- type: textarea
attributes:
label: Problem or Question
description: Describe the problem, expected behavior
validations:
required: true
- type: textarea
attributes:
label: Steps To Reproduce
description: Steps to reproduce the behavior.
placeholder: |
1. In this environment...
2. With this config...
3. Run '...'
4. See error...
validations:
required: false
- type: textarea
attributes:
label: Logs
description: |
Any logs or messages that apply
validations:
required: false
- type: textarea
attributes:
label: Extra information
description: |
Please refer to any extra information - extra documentation, attach files or images
validations:
required: false
25 changes: 25 additions & 0 deletions .github/ISSUE_TEMPLATE/04_extension.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# this flow should definitely be impoved with a form - separate suggestions,
# extensions master list and actual extensions questions, TBD

name: Extension
description: 'Questions, bugs, requests related to Extensions'
labels: ['extension']
body:
- type: checkboxes
attributes:
label: Is there already an issue for this request?
description: Please make sure you are not creating an already submitted <a href="https://github.com/nzbgetcom/nzbget/issues?q=label%3Aextension">Issue</a>. Check closed issues as well, because your issue could have been resolved and waiting to be released.
options:
- label: I have checked older issues, open and closed
required: true
- type: textarea
attributes:
label: Describe your issue
description: Describe the issue with the extension. Provide as much information as possible
placeholder: |
Existing extension - details about environment - version of nzbget - version of extension - related libs or tools if any.
Please provide as much useful information as possible
..
Or suggest new extension to be supported with Extension Manager
validations:
required: true
8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
blank_issues_enabled: true
contact_links:
- name: Discussions
url: https://github.com/nzbgetcom/nzbget/discussions
about: Discuss, suggest. Any questions, including performance issues.
- name: NZBGet.com Website
url: https://nzbget.com/contact/
about: Contact Us via Email
25 changes: 22 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,23 @@ jobs:

build-osx:
uses: ./.github/workflows/osx.yml
permissions:
actions: write

build-synology:
uses: ./.github/workflows/synology.yml

build-qnap:
uses: ./.github/workflows/qnap.yml

build-linux-pkg:
uses: ./.github/workflows/linux-pkg.yml
with:
external_call: true
needs: [build-linux]
permissions:
actions: write

repack-qnap:
uses: ./.github/workflows/qnap-repack.yml
with:
Expand All @@ -35,7 +45,7 @@ jobs:
env:
PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
runs-on: ubuntu-latest
needs: [build-windows, build-linux, build-osx, build-synology, build-qnap, repack-qnap]
needs: [build-windows, build-linux, build-osx, build-synology, build-qnap, repack-qnap, build-linux-pkg]
permissions:
actions: write
steps:
Expand All @@ -52,6 +62,8 @@ jobs:
mv nzbget-synology-packages/* builds || true
mv nzbget-qnap-packages/* builds || true
mv nzbget-qnap-native-packages/* builds || true
mv nzbget-deb-packages/* builds || true
mv nzbget-rpm-packages/* builds || true
cd builds
VERSION=$(ls | grep bin-windows-setup | cut -d - -f 2)
if [ "$GITHUB_REF_NAME" != "main" ]; then VERSION="$VERSION-testing"; fi
Expand All @@ -63,7 +75,7 @@ jobs:
echo "nzbget_signatures({" | tee $SIGS_FILE
echo | tee -a $SIGS_FILE
for FILE in *.exe *.run *.zip *.spk *.qpkg; do
for FILE in *.exe *.run *.zip *.spk *.qpkg *.deb *.rpm; do
[ -f $FILE ] || continue
MD5=$(openssl dgst -md5 $FILE | cut -d ' ' -f 2)
Expand Down Expand Up @@ -103,8 +115,15 @@ jobs:
nzbget-qnap-packages
nzbget-qnap-native-packages
- name: Delete unneded linux packages artifacts
uses: geekyeggo/delete-artifact@v4
with:
name: |
nzbget-deb-packages
nzbget-rpm-packages
make-testing-release:
runs-on: [self-hosted, linux]
runs-on: [self-hosted, nzbget-linux]
needs: [generate-signatures]
permissions:
contents: write
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,11 @@ jobs:
if [[ "$TAG" == "" ]]; then
TAG="${GITHUB_REF_NAME/\//-}"
fi
TAGS="${{ env.REGISTRY_IMAGE }}:$TAG,ghcr.io/${{ env.REGISTRY_IMAGE }}:$TAG"
if [[ "$GITHUB_REF_NAME" == "develop" ]] || [[ "$GITHUB_REF_NAME" == "main" ]] || [[ $GITHUB_REF == 'refs/tags/'* ]]; then
TAGS="${{ env.REGISTRY_IMAGE }}:$TAG,ghcr.io/${{ env.REGISTRY_IMAGE }}:$TAG"
else
TAGS="${{ env.REGISTRY_IMAGE }}:$TAG"
fi
echo "tags=$TAGS" >> $GITHUB_OUTPUT
echo "version=$TAG" >> $GITHUB_OUTPUT
Expand All @@ -72,7 +76,8 @@ jobs:
"MAKE_JOBS=2"
- name: Update Docker Hub Description
uses: peter-evans/dockerhub-description@v3
if: github.ref_name == 'main'
uses: peter-evans/dockerhub-description@v4
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
Expand Down
59 changes: 59 additions & 0 deletions .github/workflows/linux-pkg.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: linux packages

on:
workflow_call:
inputs:
external_call:
description: 'To distinguish workflow_call from regular push / workflow_dispatch'
type: boolean
required: false
default: false
workflow_dispatch:

jobs:
build-linux:
uses: ./.github/workflows/linux.yml
if: ${{ inputs.external_call == false }}

build-pkg:
runs-on: [self-hosted, nzbget-linux]
needs: [build-linux]
if: always()
permissions:
actions: write

steps:

- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Download build artifacts
uses: actions/download-artifact@v4

- name: Build DEB and RPM packages
run: |
sudo apt-get update && sudo apt-get install rpm -y
bash linux/pkg/build-pkg.sh
- name: Upload DEB build artifacts
uses: actions/upload-artifact@v4
with:
name: nzbget-deb-packages
path: build/deb/*.deb
retention-days: 5

- name: Upload RPM build artifacts
uses: actions/upload-artifact@v4
with:
name: nzbget-rpm-packages
path: build/rpm/*.rpm
retention-days: 5

- name: Delete unneded linux artifacts
if: ${{ inputs.external_call == false }}
uses: geekyeggo/delete-artifact@v4
with:
name: |
nzbget-linux-installers

0 comments on commit 466b8b6

Please sign in to comment.