updates

userdocs · Oct 6, 2024 · 68a8e19 · 68a8e19
1 parent 027efa8
commit 68a8e19
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/.github/workflows/qt6_crossbuild.yml b/.github/workflows/qt6_crossbuild.yml
@@ -6,13 +6,14 @@ on:
       skip_rerun:
         description: "Skip rerun?"
         required: true
+        default: true
         type: boolean
       retries:
-        description: 'Number of rerun retries'
+        description: "Number of rerun retries"
         required: true
-        default: '5'
+        default: "1"
         type: choice
-        options: [ "1", "2", "3", "4", "5", "6", "7", "8", "9" ]
+        options: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -31,13 +32,15 @@ jobs:
       matrix:
         name: [qt6]
         os_id: [debian, ubuntu]
-        os_codename: [bullseye, bookworm, focal, jammy]
+        os_codename: [bullseye, bookworm, focal, jammy, noble]
         arch: [amd64, armhf, arm64]
         exclude:
           - os_id: debian
             os_codename: focal
           - os_id: debian
             os_codename: jammy
+          - os_id: debian
+            os_codename: noble
           - os_id: ubuntu
             os_codename: bullseye
           - os_id: ubuntu
@@ -245,7 +248,7 @@ jobs:
           replacesArtifacts: true
           tag: "${{ env.qt_version }}"
           name: "qt ${{ env.qt_version }}"
-          body: "Built with cmake using v${{ env.qt_version }} from github on amd64 arm64 armhf for Debian Buster Bullseye and Ubuntu bionic Focal Jammy"
+          body: "Built with cmake using v${{ env.qt_version }} from github on amd64 arm64 armhf for Debian Bullseye Bookworm and Ubuntu Focal Jammy Noble"
           allowUpdates: true
 
   rerun-on-failure:
@@ -256,10 +259,10 @@ jobs:
       actions: write
     runs-on: ubuntu-latest
     env:
-      GH_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+      GH_TOKEN: "${{ github.TOKEN }}"
     steps:
       - uses: actions/checkout@v4
       - name: Trigger rerun workflow on job failures
         run: |
-          inputs_value="${{ inputs.retries }}"
-          gh workflow run rerun.yml -f run_id=${{ github.run_id }} -f attempts=${{ github.run_attempt }} -f retries=${inputs_value:-3}
+          inputs_retries="${{ inputs.retries }}"
+          gh workflow run rerun.yml -f run_id=${{ github.run_id }} -f attempts=${{ github.run_attempt }} -f retries=${inputs_retries:-1}
diff --git a/.github/workflows/rerun.yml b/.github/workflows/rerun.yml
@@ -4,10 +4,13 @@ on:
   workflow_dispatch:
     inputs:
       run_id:
+        description: "The run id of the workflow to rerun"
         required: true
       attempts:
+        description: "The number of attempts to rerun the workflow"
         required: true
       retries:
+        description: "The number of retries to rerun the workflow"
         required: true
 
 jobs:
@@ -23,7 +26,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: gh cli rerun and summaries
-        if: inputs.attempts < inputs.retries
+        if: inputs.attempts <= inputs.retries
         run: |
           failures="$(gh run view ${{ inputs.run_id }} --log-failed | sed "s,\x1B\[[0-9;]*[a-zA-Z],,g")"
           [[ -z "${failures}" ]] && failures="$(gh run view ${{ inputs.run_id }} | sed "s,\x1B\[[0-9;]*[a-zA-Z],,g")"