Merge pull request #340 from nzbgetcom/develop

Release v24.2
nzbgetcom · Aug 5, 2024 · b41ebcf · b41ebcf
2 parents f223cdd + bc9637c
commit b41ebcf
Show file tree

Hide file tree

Showing 206 changed files with 41,485 additions and 6,510 deletions.
diff --git a/.github/ISSUE_TEMPLATE/01_bug_report.yml b/.github/ISSUE_TEMPLATE/01_bug_report.yml
@@ -14,11 +14,19 @@ body:
     label: NZBGet Version
     description: Which version of NZBGet has this bug?
     options:
+    - v24.2-stable
+    - v24.3-testing
+    - v24.1-stable
+    - v24.1-testing
+    - v24-stable
+    - v24-testing
     - v23-stable
     - v23-testing
     - v22-stable (nzbgetcom takeover)
     - v22-testing (nzbgetcom takeover)
     - v21 or earlier (orignal nzbget)
+    - latest-stable (if not listed here)
+    - latest-testing (if not listed here)
   validations:
     required: true
 - type: dropdown

diff --git a/.github/ISSUE_TEMPLATE/03_build.yml b/.github/ISSUE_TEMPLATE/03_build.yml
@@ -7,11 +7,19 @@ body:
     label: NZBGet Version
     description: Version of NZBGet for the scope of this issue
     options:
+    - v24.2-stable
+    - v24.3-testing
+    - v24.1-stable
+    - v24.1-testing
+    - v24-stable
+    - v24-testing
     - v23-stable
     - v23-testing
     - v22-stable (nzbgetcom takeover)
     - v22-testing (nzbgetcom takeover)
     - v21 or earlier (orignal nzbget)
+    - latest-stable (if not listed here)
+    - latest-testing (if not listed here)
   validations:
     required: true
 - type: dropdown

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -0,0 +1,47 @@
+name: android build 
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: [self-hosted, nzbget-android]
+
+    steps:
+
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+
+    - name: Build
+      run: |
+        BUILD_PARAMS="android bin installer"
+        if [ "$GITHUB_REF_NAME" == "develop" ] || [ "$GITHUB_REF_NAME" == "main" ]; then
+          BUILD_PARAMS="$BUILD_PARAMS debug release"
+        else
+          BUILD_PARAMS="$BUILD_PARAMS release"
+        fi
+        if [ "$GITHUB_REF_NAME" != "main" ]; then
+          BUILD_PARAMS="$BUILD_PARAMS testing"
+        fi
+        bash linux/build-nzbget.sh $BUILD_PARAMS
+
+    - name: Rename build artifacts
+      if: github.ref_name != 'main' && github.ref_name != 'develop'
+      run: |
+        cd build
+        SUFFIX="-${GITHUB_REF_NAME/\//-}-bin-android.run"
+        for FILE in *.run; do
+          [ -f $FILE ] || continue
+          NEW_FILE=${FILE/-bin-android.run/$SUFFIX}
+          mv $FILE $NEW_FILE
+        done
+
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: nzbget-android-installers
+        path: build/*.run
+        retention-days: 5
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,18 +13,15 @@ jobs:
 
   build-linux:
     uses: ./.github/workflows/linux.yml
-
+
+  build-android:
+    uses: ./.github/workflows/android.yml
+
   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:
@@ -40,12 +37,12 @@ jobs:
     needs: [build-linux]
     permissions:
       actions: write
-  
+
   generate-signatures:
     env:
       PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
     runs-on: ubuntu-latest
-    needs: [build-windows, build-linux, build-osx, build-synology, build-qnap, repack-qnap, build-linux-pkg]
+    needs: [build-windows, build-linux, build-osx, build-android, repack-qnap, build-linux-pkg]
     permissions:
       actions: write
     steps:
@@ -58,10 +55,9 @@ jobs:
         mkdir -p builds
         mv nzbget-windows-installers/* builds || true
         mv nzbget-linux-installers/* builds || true
+        mv nzbget-android-installers/* builds || true
         mv nzbget-osx-installers/* builds || true
-        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
@@ -110,10 +106,9 @@ jobs:
         name: |
           nzbget-windows-installers
           nzbget-linux-installers
+          nzbget-android-installers
           nzbget-osx-installers
-          nzbget-synology-packages
           nzbget-qnap-packages
-          nzbget-qnap-native-packages
 
     - name: Delete unneded linux packages artifacts
       uses: geekyeggo/delete-artifact@v4

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -65,7 +65,8 @@ jobs:
     - name: Build and push
       uses: docker/build-push-action@v5
       with:
-        context: docker
+        context: .
+        file: docker/Dockerfile
         platforms: linux/amd64,linux/arm64,linux/arm/v7
         provenance: false
         push: true

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -15,46 +15,33 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Change version for non-release
-      if: github.ref_name != 'main'
-      run: |
-        VERSION=$(cat configure.ac | grep AC_INIT | cut -d , -f 2 | xargs)
-        NEW_VERSION="$VERSION-testing-$(date '+%Y%m%d')"
-        sed -e "s|AC_INIT(nzbget.*|AC_INIT(nzbget, $NEW_VERSION, https://github.com/nzbgetcom/nzbget/issues)|g" -i configure.ac
-        echo NEW_VERSION=$NEW_VERSION >> $GITHUB_ENV
-
     - name: Build
       run: |
-        rm -rf /build/nzbget
-        rm -rf /build/output
-        cp -r . /build/nzbget
-        cd /build
+        BUILD_PARAMS="linux bin installer"
         if [ "$GITHUB_REF_NAME" == "develop" ] || [ "$GITHUB_REF_NAME" == "main" ]; then
-          DEBUG=yes
+          BUILD_PARAMS="$BUILD_PARAMS debug release"
         else
-          DEBUG=no
+          BUILD_PARAMS="$BUILD_PARAMS release"
+        fi
+        if [ "$GITHUB_REF_NAME" != "main" ]; then
+          BUILD_PARAMS="$BUILD_PARAMS testing"
         fi
-        ALL_ARCHS="i686 x86_64 aarch64 armhf armel mipseb mipsel ppc6xx ppc500 riscv64" DEBUG=$DEBUG /build/scripts/build-nzbget-ci.sh
+        bash linux/build-nzbget.sh $BUILD_PARAMS
 
     - name: Rename build artifacts
       if: github.ref_name != 'main' && github.ref_name != 'develop'
       run: |
-        cd /build/output
-        NEW_VERSION_FEATURE="$NEW_VERSION-${GITHUB_REF_NAME/\//-}"
+        cd build
+        SUFFIX="-${GITHUB_REF_NAME/\//-}-bin-linux.run"
         for FILE in *.run; do
           [ -f $FILE ] || continue
-          NEW_FILE=${FILE/$NEW_VERSION/$NEW_VERSION_FEATURE}
-          mv $FILE $NEW_FILE          
+          NEW_FILE=${FILE/-bin-linux.run/$SUFFIX}
+          mv $FILE $NEW_FILE
         done
 
     - name: Upload build artifacts
       uses: actions/upload-artifact@v4
       with:
         name: nzbget-linux-installers
-        path: /build/output/*.run
+        path: build/*.run
         retention-days: 5
-
-    - name: Cleanup
-      run: |
-        rm -rf /build/nzbget
-        rm -rf /build/output
diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
@@ -18,9 +18,9 @@ jobs:
     - name: Build
       run: |
         if [ "$GITHUB_REF_NAME" != "main" ]; then
-          bash osx/build-nzbget-x64.sh testing
+          bash osx/build-nzbget.sh x64 testing
         else
-          bash osx/build-nzbget-x64.sh
+          bash osx/build-nzbget.sh x64
         fi
 
     - name: Rename build artifacts
@@ -51,34 +51,30 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Change version for non-release
-      if: github.ref_name != 'main'
-      run: |
-        VERSION=$(cat configure.ac | grep AC_INIT | cut -d , -f 2 | xargs)
-        NEW_VERSION="$VERSION-testing-$(date '+%Y%m%d')"
-        sed -e "s|AC_INIT(nzbget.*|AC_INIT(nzbget, $NEW_VERSION, https://github.com/nzbgetcom/nzbget/issues)|g" -i '' configure.ac
-        echo NEW_VERSION=$NEW_VERSION >> $GITHUB_ENV
-
     - name: Build
       run: |
-        bash osx/build-nzbget-universal.sh
+        if [ "$GITHUB_REF_NAME" != "main" ]; then
+          bash osx/build-nzbget.sh universal testing
+        else
+          bash osx/build-nzbget.sh universal
+        fi
 
     - name: Rename build artifacts
       if: github.ref_name != 'main' && github.ref_name != 'develop'
       run: |
-        cd osx/build/Release
-        NEW_VERSION_FEATURE="$NEW_VERSION-${GITHUB_REF_NAME/\//-}"
+        cd build
+        SUFFIX="${GITHUB_REF_NAME/\//-}"
         for FILE in *.zip; do
           [ -f $FILE ] || continue
-          NEW_FILE=${FILE/$NEW_VERSION/$NEW_VERSION_FEATURE}
+          NEW_FILE=${FILE/-bin-macos-universal.zip/-$SUFFIX-bin-macos-universal.zip}
           mv $FILE $NEW_FILE
         done
 
     - name: Upload build artifacts
       uses: actions/upload-artifact@v4
       with:
         name: nzbget-osx-installers-universal
-        path: osx/build/Release/*.zip
+        path: build/*-universal.zip
         retention-days: 5
 
   combine-osx-artifacts:

diff --git a/.github/workflows/qnap-repack.yml b/.github/workflows/qnap-repack.yml
@@ -40,7 +40,7 @@ jobs:
     - name: Rename build artifacts
       if: github.ref_name != 'main'
       run: |
-        VERSION=$(cat configure.ac | grep AC_INIT | cut -d , -f 2 | xargs)
+        VERSION=$(grep "set(VERSION " CMakeLists.txt | cut -d '"' -f 2)
         NEW_VERSION="$VERSION-testing-$(date '+%Y%m%d')"
         cd /qnap/nzbget/build/
         for FILE in *.qpkg; do

diff --git a/.github/workflows/qnap.yml b/.github/workflows/qnap.yml
diff --git a/.github/workflows/synology.yml b/.github/workflows/synology.yml