PADD v3.11.1 (#355)

pi-hole · Sep 25, 2023 · fb92108 · fb92108
2 parents 81aeac9 + 70826ce
commit fb92108
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 13 deletions.
diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
     -
       name: Checkout repository
-      uses: actions/checkout@v3.5.2
+      uses: actions/checkout@v4.1.0
     -
       name: Spell-Checking
       uses: codespell-project/actions-codespell@master

diff --git a/.github/workflows/editorconfig-checker.yml b/.github/workflows/editorconfig-checker.yml
@@ -9,6 +9,6 @@ jobs:
       name: editorconfig-checker
       runs-on: ubuntu-latest
       steps:
-        - uses: actions/checkout@v3.5.2
+        - uses: actions/checkout@v4.1.0
         - uses: editorconfig-checker/action-editorconfig-checker@main # current tag v1.0.0 is really out-of-date
         - run: editorconfig-checker
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -40,7 +40,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.4.0
+        uses: actions/checkout@v4.1.0
       - name: Remove 'stale' label
         run: gh issue edit ${{ github.event.issue.number }} --remove-label ${{ env.stale_label }}
         env:

diff --git a/.github/workflows/sync-back-to-dev.yml b/.github/workflows/sync-back-to-dev.yml
@@ -11,7 +11,7 @@ jobs:
     name: Syncing branches
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v4.1.0
       - name: Opening pull request
         run: gh pr create -B development -H master --title 'Sync master back into development' --body 'Created by Github action' --label 'Internal'
         env:

diff --git a/.github/workflows/version_bump.yml b/.github/workflows/version_bump.yml
@@ -19,7 +19,7 @@ jobs:
           echo "latest_tag=$LATEST_TAG" >> $GITHUB_ENV
 
       - name: Checkout code
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v4.1.0
         with:
           ref: 'development'
 

diff --git a/.stickler.yml b/.stickler.yml
diff --git a/padd.sh b/padd.sh
@@ -15,7 +15,7 @@ export LC_NUMERIC=C
 ############################################ VARIABLES #############################################
 
 # VERSION
-padd_version="v3.11.0"
+padd_version="v3.11.1"
 
 # LastChecks
 LastCheckVersionInformation=$(date +%s)
@@ -160,6 +160,9 @@ GetSystemInformation() {
   # System uptime
     system_uptime_raw=$(uptime)
 
+  # reset $cpu variable
+  unset cpu
+
   # CPU temperature
   if [ -d "/sys/devices/platform/coretemp.0/hwmon/" ]; then
     cpu=$(cat "$(find /sys/devices/platform/coretemp.0/hwmon/ -maxdepth 2 -name "temp1_input" 2>/dev/null | head -1)" 2>/dev/null)
@@ -441,6 +444,9 @@ GetVersionInformation() {
     docker_version_converted="$(VersionConverter "${DOCKER_VERSION}")"
     docker_version_latest_converted="$(VersionConverter "${GITHUB_DOCKER_VERSION}")"
 
+    # Note: the version comparison will fail for any Docker tag not following a 'YYYY.MM.VV' scheme
+    #       e.g. 'nightly', 'beta', 'v6-pre-alpha' and might set a false out_of_date_flag
+    #       As those versions are not meant to be used in production, we ignore this small bug
     if [ "${docker_version_converted}" -lt "${docker_version_latest_converted}" ]; then
       out_of_date_flag="true"
       docker_version_heatmap=${red_text}