v2.1.0

userdocs · Jan 17, 2025 · 6973c1e · 6973c1e
1 parent a754a3d
commit 6973c1e
Show file tree

Hide file tree

Showing 4 changed files with 3,140 additions and 32 deletions.
diff --git a/.github/workflows/ci-alpine-build.yml b/.github/workflows/ci-alpine-build.yml
@@ -99,8 +99,11 @@ jobs:
       - name: Docker - apk install bash ${{ inputs.distinct_id }}
         run: docker exec -w /root multiarch apk add bash
 
-      - name: Docker - Bootstrap ${{ inputs.distinct_id }}
-        run: docker exec -w /root multiarch bash qbittorrent-nox-static.sh -bs-a
+      - name: Docker - Bootstrap deps ${{ inputs.distinct_id }}
+        run: docker exec -w /root multiarch bash qbt-nox-static.bash bootstrap_deps
+
+      - name: Docker - Bootstrap build ${{ inputs.distinct_id }}
+        run: docker exec -w /root multiarch bash qbt-nox-static.bash -bs-a
 
       - name: Host - qBittorrent v5 transition ${{ inputs.distinct_id }}
         run: |
@@ -115,43 +118,43 @@ jobs:
 
       - name: Docker - zlib-ng ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
-        run: docker exec -w /root multiarch bash qbittorrent-nox-static.sh zlib
+        run: docker exec -w /root multiarch bash qbt-nox-static.bash zlib
 
       - name: Docker - iconv ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
-        run: docker exec -w /root multiarch bash qbittorrent-nox-static.sh iconv
+        run: docker exec -w /root multiarch bash qbt-nox-static.bash iconv
 
       - name: Docker - icu ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
-        run: docker exec -w /root multiarch bash qbittorrent-nox-static.sh icu
+        run: docker exec -w /root multiarch bash qbt-nox-static.bash icu
 
       - name: Docker - openssl ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
-        run: docker exec -w /root multiarch bash qbittorrent-nox-static.sh openssl
+        run: docker exec -w /root multiarch bash qbt-nox-static.bash openssl
 
       - name: Docker - boost ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
-        run: docker exec -w /root multiarch bash qbittorrent-nox-static.sh boost
+        run: docker exec -w /root multiarch bash qbt-nox-static.bash boost
 
       - name: Docker - libtorrent ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
-        run: docker exec -w /root multiarch bash qbittorrent-nox-static.sh libtorrent
+        run: docker exec -w /root multiarch bash qbt-nox-static.bash libtorrent
 
       - name: Docker - double_conversion ${{ inputs.distinct_id }}
         if: matrix.qbt_build_tool == '' && env.disable_qt5 != 'yes'
-        run: docker exec -w /root multiarch bash qbittorrent-nox-static.sh double_conversion
+        run: docker exec -w /root multiarch bash qbt-nox-static.bash double_conversion
 
       - name: Docker - qtbase ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
-        run: docker exec -w /root multiarch bash qbittorrent-nox-static.sh qtbase
+        run: docker exec -w /root multiarch bash qbt-nox-static.bash qtbase
 
       - name: Docker - qttools ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
-        run: docker exec -w /root multiarch bash qbittorrent-nox-static.sh qttools
+        run: docker exec -w /root multiarch bash qbt-nox-static.bash qttools
 
       - name: Docker - qbittorrent ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
-        run: docker exec -w /root multiarch bash qbittorrent-nox-static.sh qbittorrent
+        run: docker exec -w /root multiarch bash qbt-nox-static.bash qbittorrent
 
       - name: Docker - Set release asset name ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'

diff --git a/.github/workflows/ci-debian-build.yml b/.github/workflows/ci-debian-build.yml
@@ -30,18 +30,12 @@ jobs:
       fail-fast: false
       matrix:
         container_id: [debian, ubuntu]
-        container_codename: [bookworm, jammy, noble]
+        container_codename: [bookworm, noble]
         qbt_build_tool: ["cmake", "qmake"]
         qbt_libtorrent_version: ["1.2", "2.0"]
         exclude:
-          - container_id: debian
-            container_codename: focal
-          - container_id: debian
-            container_codename: jammy
           - container_id: debian
             container_codename: noble
-          - container_id: ubuntu
-            container_codename: bullseye
           - container_id: ubuntu
             container_codename: bookworm
         include:
@@ -88,8 +82,11 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Bootstrap all ${{ inputs.distinct_id }}
-        run: bash qbittorrent-nox-static.sh -bs-a
+      - name: Bootstrap deps ${{ inputs.distinct_id }}
+        run: bash qbt-nox-static.bash bootstrap_deps
+
+      - name: Bootstrap build ${{ inputs.distinct_id }}
+        run: bash qbt-nox-static.bash -bs-a
 
       - name: Host - qBittorrent v5 transition ${{ inputs.distinct_id }}
         run: |
@@ -103,47 +100,47 @@ jobs:
 
       - name: glibc ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
-        run: bash qbittorrent-nox-static.sh glibc
+        run: bash qbt-nox-static.bash glibc
 
       - name: zlib ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
-        run: bash qbittorrent-nox-static.sh zlib
+        run: bash qbt-nox-static.bash zlib
 
       - name: iconv ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
-        run: bash qbittorrent-nox-static.sh iconv
+        run: bash qbt-nox-static.bash iconv
 
       - name: icu ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
-        run: bash qbittorrent-nox-static.sh icu
+        run: bash qbt-nox-static.bash icu
 
       - name: openssl ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
-        run: bash qbittorrent-nox-static.sh openssl
+        run: bash qbt-nox-static.bash openssl
 
       - name: boost ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
-        run: bash qbittorrent-nox-static.sh boost
+        run: bash qbt-nox-static.bash boost
 
       - name: libtorrent ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
-        run: bash qbittorrent-nox-static.sh libtorrent
+        run: bash qbt-nox-static.bash libtorrent
 
       - name: double conversion ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes' && matrix.qbt_build_tool == 'cmake'
-        run: bash qbittorrent-nox-static.sh double_conversion
+        run: bash qbt-nox-static.bash double_conversion
 
       - name: qtbase ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
-        run: bash qbittorrent-nox-static.sh qtbase
+        run: bash qbt-nox-static.bash qtbase
 
       - name: qttools ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
-        run: bash qbittorrent-nox-static.sh qttools
+        run: bash qbt-nox-static.bash qttools
 
       - name: qbittorrent ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
-        run: bash qbittorrent-nox-static.sh qbittorrent
+        run: bash qbt-nox-static.bash qbittorrent
 
       - name: Upload ${{ env.artifact_name }} artifacts ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,31 @@
+### v2.0.15 - 12/01/2025
+
+`qbt-nox-static.bash` will be a created alongside the `qbittorrent-nox-static.sh`.
+
+`qbt-nox-static.bash` ≥ `v2.1.0`
+
+`qbt-nox-static.bash` will start `v2.1.0` and `qbittorrent-nox-static.sh` will be frozen at `v2.0.14`going forward.
+
+This is to avoid breaking anything. `v2.1.0` is not really changing the outcome but the behaviour of the script towards that outcome. So the least disruptive way is the opt in route.
+
+I also wanted to changed the extension from `sh` to `bash` as it is a bash script.
+
+Main changes:
+
+A reworked dependency and module installation logic, which has changed the default behaviour of the script. The script was designed to be run in a docker and needs `curl` and `git` to perform basic test functions. So it would automatically try to install all deps from a single array when run as root or with sudo to able to then do the basic interactions.
+
+This has been changed so that the script makes does not modify the host or create files if just called by it's name. It will do basic dependency checks and offer options to install what's needed.
+
+It can now only install the required test dependencies or perform basic functions if they are already installed meaning the basic features and help functions are usable without installing the full suits of dependencies.
+
+Updated the default build flags to be a bit more modern which breaks building on some older systems.
+
+Removed build script support for buster and focal due to conflicts with updated builds flags and will support current releases only going forward.
+
+general refactoring towards more consistent use of arrays data throughout the script.
+
+credits: Borrowed some build flags from here [qbittorrent/docker-qbittorrent-nox](https://github.com/qbittorrent/docker-qbittorrent-nox/blob/main/Dockerfile#L59-L61)
+
 ### v2.0.14 - 31/12/2024
 
 fix: libtorrent `v1.2` and boost `1.86.0` check to not ignore `RC_1_2`