docs

Update qbittorrent-nox-static.sh Update changelog.md Update deploy.yml v.2.1.0 V2.1.0 v2.1.0 v2.1.0 v2.1.0 docs v2.1.0 v2.1.0 v2.1.0 workflows docs
userdocs · Jan 21, 2025 · 4c30a58 · 4c30a58
1 parent 574f360
commit 4c30a58
Show file tree

Hide file tree

Showing 18 changed files with 3,935 additions and 509 deletions.
diff --git a/.github/workflows/ci-alpine-build.yml b/.github/workflows/ci-alpine-build.yml
@@ -20,7 +20,10 @@ on:
         description: "debug builds"
         required: true
         type: string
-
+      script_name:
+        description: "script name"
+        required: true
+        type: string
 jobs:
   build-alpine:
     runs-on: ubuntu-24.04
@@ -44,6 +47,7 @@ jobs:
 
     env:
       qbt_build_dir: "qbt-build"
+      script_name: ${{ inputs.script_name }}
 
     steps:
       - name: Checkout ${{ inputs.distinct_id }}
@@ -57,8 +61,8 @@ jobs:
       - name: Host - update ${{ inputs.distinct_id }}
         run: sudo apt-get update
 
-      - name: Host - upgrade ${{ inputs.distinct_id }}
-        run: sudo apt-get -y upgrade
+      # - name: Host - upgrade ${{ inputs.distinct_id }}
+      #   run: sudo apt-get -y upgrade
 
       - name: Host - set up qemu-user-static binfmt-support ${{ inputs.distinct_id }}
         run: sudo apt install libpipeline1 qemu-user-static binfmt-support
@@ -76,10 +80,10 @@ jobs:
           printf '%s\n' "qbt_cross_name=${{ matrix.qbt_cross_name }}" >> env.custom
           printf '%s\n' "qbt_patches_url=${{ github.repository }}" >> env.custom
           printf '%s\n' "qbt_skip_icu=${set_skip_icu}" >> env.custom
-          printf '%s\n' "qbt_boost_tag=" >> env.custom
-          printf '%s\n' "qbt_libtorrent_tag=" >> env.custom
-          printf '%s\n' "qbt_qt_tag=" >> env.custom
-          printf '%s\n' "qbt_qbittorrent_tag=" >> env.custom
+          printf '%s\n' "qbt_boost_tag=${{ matrix.qbt_boost_tag }}" >> env.custom
+          printf '%s\n' "qbt_libtorrent_tag=${{ matrix.qbt_libtorrent_tag }}" >> env.custom
+          printf '%s\n' "qbt_qt_tag=${{ matrix.qbt_qt_tag }}" >> env.custom
+          printf '%s\n' "qbt_qbittorrent_tag=${{ matrix.qbt_qbittorrent_tag }}" >> env.custom
           printf '%s\n' "qbt_libtorrent_master_jamfile=" >> env.custom
           printf '%s\n' "qbt_workflow_files=${set_workflow_files}" >> env.custom
           printf '%s\n' "qbt_workflow_artifacts=" >> env.custom
@@ -99,8 +103,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 ${script_name} bootstrap_deps
+
+      - name: Docker - Bootstrap build ${{ inputs.distinct_id }}
+        run: docker exec -w /root multiarch bash ${script_name} -bs-a
 
       - name: Host - qBittorrent v5 transition ${{ inputs.distinct_id }}
         run: |
@@ -109,49 +116,45 @@ jobs:
               printf '%s\n' "Found file: \`disable-qt5\`: settings \`disable_qt5=yes\` to yes" >> $GITHUB_STEP_SUMMARY
           fi
 
-      # - name: Docker - Copy repo patches to build folder ${{ inputs.distinct_id }}
-      #   if: env.disable_qt5 != 'yes'
-      #   run: if [[ -d patches ]]; then docker exec -w /root multiarch cp -r patches/* /root/${{ env.qbt_build_dir }}/patches; fi
-
       - 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 ${script_name} 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 ${script_name} 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 ${script_name} 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 ${script_name} 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 ${script_name} 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 ${script_name} 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 ${script_name} 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 ${script_name} 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 ${script_name} 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 ${script_name} qbittorrent
 
       - name: Docker - Set release asset name ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
@@ -168,7 +171,7 @@ jobs:
         run: docker exec -w /root/${{ env.qbt_build_dir }}/release_info multiarch bash -c 'mv *.md *.json '/root/${{ env.qbt_build_dir }}/completed''
 
       - name: Host - Upload libtorrent-v${{ matrix.qbt_libtorrent_version }}-qbittorrent-nox and release info artifact ${{ inputs.distinct_id }}
-        if: env.disable_qt5 != 'yes'
+        if: success() && env.disable_qt5 != 'yes'
         uses: actions/upload-artifact@v4
         with:
           name: libtorrent-v${{ matrix.qbt_libtorrent_version }}-${{ matrix.qbt_cross_name }}-${{ matrix.qbt_qt_version_name }}qbittorrent-nox
@@ -177,8 +180,15 @@ jobs:
             !${{ env.qbt_build_dir }}/completed/*.png
 
       - name: Host - Upload cmake graphs artifact ${{ inputs.distinct_id }}
-        if: matrix.qbt_build_tool == '' && env.disable_qt5 != 'yes'
+        if: success() && matrix.qbt_build_tool == '' && env.disable_qt5 != 'yes'
         uses: actions/upload-artifact@v4
         with:
           name: "${{ matrix.qbt_cross_name }}-libtorrent-v${{ matrix.qbt_libtorrent_version }}-graphs"
           path: "${{ env.qbt_build_dir }}/completed/*.png"
+
+      - name: Host - Upload logs on error
+        if: failure() && env.disable_qt5 != 'yes'
+        uses: actions/upload-artifact@v4
+        with:
+          name: "${{ matrix.qbt_cross_name }}-libtorrent-v${{ matrix.qbt_libtorrent_version }}-logs"
+          path: "${{ env.qbt_build_dir }}/logs/*"
diff --git a/.github/workflows/ci-checks.yml b/.github/workflows/ci-checks.yml
@@ -11,6 +11,8 @@ concurrency:
 jobs:
   sh-checker:
     runs-on: ubuntu-24.04
+    permissions:
+      contents: read
     steps:
       - uses: actions/checkout@v4
         with:
@@ -28,6 +30,8 @@ jobs:
 
   zizmor-checker:
     runs-on: ubuntu-24.04
+    permissions:
+      contents: read
     steps:
       - uses: actions/checkout@v4
         with:
@@ -51,6 +55,8 @@ jobs:
 
   editorconfig-checker:
     runs-on: ubuntu-24.04
+    permissions:
+      contents: read
     steps:
       - uses: actions/checkout@v4
         with:
@@ -68,4 +74,3 @@ jobs:
           printf '%b' "\`\`\`" >> $GITHUB_STEP_SUMMARY
 
           # exit "${exit_code}"
-
diff --git a/.github/workflows/ci-debian-build.yml b/.github/workflows/ci-debian-build.yml
@@ -19,6 +19,10 @@ on:
         description: "debug builds"
         required: true
         type: string
+      script_name:
+        description: "script name"
+        required: true
+        type: string
 
 jobs:
   build:
@@ -30,7 +34,7 @@ jobs:
       fail-fast: false
       matrix:
         container_id: [debian, ubuntu]
-        container_codename: [bookworm, jammy, noble]
+        container_codename: [bullseye, bookworm, focal, jammy, noble]
         qbt_build_tool: ["cmake", "qmake"]
         qbt_libtorrent_version: ["1.2", "2.0"]
         exclude:
@@ -51,10 +55,13 @@ jobs:
             qbt_qt_version: "6"
 
     name: "${{ matrix.container_id }}-${{ matrix.container_codename }}-${{ matrix.qbt_libtorrent_version }}-qt-${{ matrix.qbt_qt_version }}-${{ matrix.qbt_build_tool }}"
+
     env: # host
       qbt_build_dir: "qbt-build"
       disable_qt5: ""
       artifact_name: "${{ matrix.container_id }}-${{ matrix.container_codename }}-${{ matrix.qbt_libtorrent_version }}-qt-${{ matrix.qbt_qt_version }}-${{ matrix.qbt_build_tool }}-nox"
+      script_name: ${{ inputs.script_name }}
+
     container:
       image: ${{ matrix.container_id }}:${{ matrix.container_codename }}
       env: # container
@@ -66,13 +73,13 @@ jobs:
         qbt_libtorrent_version: ${{ matrix.qbt_libtorrent_version }}
         qbt_qt_version: ${{ matrix.qbt_qt_version }}
         qbt_build_tool: ${{ matrix.qbt_build_tool }}
-        qbt_cross_name: ""
+        qbt_cross_name: ${{ matrix.qbt_cross_name }}
         qbt_patches_url: ${{ github.repository }}
         qbt_skip_icu: ${{ inputs.icu }}
-        qbt_boost_tag: ""
-        qbt_libtorrent_tag: ""
-        qbt_qt_tag: ""
-        qbt_qbittorrent_tag: ""
+        qbt_boost_tag: ${{ matrix.qbt_boost_tag }}
+        qbt_libtorrent_tag: ${{ matrix.qbt_libtorrent_tag }}
+        qbt_qt_tag: ${{ matrix.qbt_qt_tag }}
+        qbt_qbittorrent_tag: ${{ matrix.qbt_qbittorrent_tag }}
         qbt_libtorrent_master_jamfile: ""
         qbt_workflow_files: ${{ inputs.workflow-files }}
         qbt_workflow_artifacts: ""
@@ -88,11 +95,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 ${script_name} bootstrap_deps
 
-      - name: Host - qBittorrent v5 transition ${{ inputs.distinct_id }}
-        run: |
+      - name: Bootstrap build ${{ inputs.distinct_id }}
+        run: bash ${script_name} -bs-a
 
       - name: Host - qBittorrent v5 transition ${{ inputs.distinct_id }}
         run: |
@@ -103,51 +110,58 @@ jobs:
 
       - name: glibc ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
-        run: bash qbittorrent-nox-static.sh glibc
+        run: bash ${script_name} glibc
 
       - name: zlib ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
-        run: bash qbittorrent-nox-static.sh zlib
+        run: bash ${script_name} zlib
 
       - name: iconv ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
-        run: bash qbittorrent-nox-static.sh iconv
+        run: bash ${script_name} iconv
 
       - name: icu ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
-        run: bash qbittorrent-nox-static.sh icu
+        run: bash ${script_name} icu
 
       - name: openssl ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
-        run: bash qbittorrent-nox-static.sh openssl
+        run: bash ${script_name} openssl
 
       - name: boost ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
-        run: bash qbittorrent-nox-static.sh boost
+        run: bash ${script_name} boost
 
       - name: libtorrent ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
-        run: bash qbittorrent-nox-static.sh libtorrent
+        run: bash ${script_name} 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 ${script_name} double_conversion
 
       - name: qtbase ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
-        run: bash qbittorrent-nox-static.sh qtbase
+        run: bash ${script_name} qtbase
 
       - name: qttools ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
-        run: bash qbittorrent-nox-static.sh qttools
+        run: bash ${script_name} qttools
 
       - name: qbittorrent ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
-        run: bash qbittorrent-nox-static.sh qbittorrent
+        run: bash ${script_name} qbittorrent
 
       - name: Upload ${{ env.artifact_name }} artifacts ${{ inputs.distinct_id }}
         if: env.disable_qt5 != 'yes'
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name }}
           path: ${{ env.qbt_build_dir }}/completed/qbittorrent-nox
+
+      - name: Host - Upload logs on error
+        if: failure() && env.disable_qt5 != 'yes'
+        uses: actions/upload-artifact@v4
+        with:
+          name: "${{ env.artifact_name }}-logs"
+          path: "${{ env.qbt_build_dir }}"
diff --git a/.github/workflows/ci-main-reusable-caller.yml b/.github/workflows/ci-main-reusable-caller.yml
@@ -4,6 +4,12 @@ name: ci - main reusable caller
 on:
   workflow_dispatch:
     inputs:
+      script_name:
+        description: "Which script to run?"
+        required: true
+        default: "qbt-nox-static.bash"
+        type: choice
+        options: ["qbt-nox-static.bash", "qbittorrent-nox-static.sh"]
       debian-build:
         description: "Debian: build"
         required: true
@@ -51,21 +57,26 @@ on:
         options: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]
 
 concurrency:
-  group: ci-main-reusable-caller
+  group: ${{ github.workflow }}
   cancel-in-progress: true
 
+permissions: {}
+
 jobs:
   ci-debian-build:
     if: always() && github.event.inputs.debian-build == 'true'
     concurrency:
       group: ci-debian-build
       cancel-in-progress: true
+    permissions:
+      contents: read
     uses: ./.github/workflows/ci-debian-build.yml
     with:
       distinct_id: ${{ github.event.inputs.distinct_id }}
       workflow-files: ${{ github.event.inputs.workflow-files == 'true' && 'yes' || 'no' }}
       icu: ${{ github.event.inputs.icu == 'true' && 'no' || 'yes' }}
       debug: ${{ github.event.inputs.debug == 'true' && 'yes' || 'no' }}
+      script_name: ${{ github.event.inputs.script_name }}
 
   ci-alpine-build:
     if: always() && github.event.inputs.alpine-build == 'true'
@@ -82,6 +93,7 @@ jobs:
       workflow-files: ${{ github.event.inputs.workflow-files == 'true' && 'yes' || 'no' }}
       icu: ${{ github.event.inputs.icu == 'true' && 'no' || 'yes' }}
       debug: ${{ github.event.inputs.debug == 'true' && 'yes' || 'no' }}
+      script_name: ${{ github.event.inputs.script_name }}
 
   ci-alpine-release:
     needs: [ci-alpine-build]

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -13,6 +13,8 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     steps:
       - name: Checkout your repository using git
         uses: actions/checkout@v4