Merge branch 'main' into testing

ublue-os · May 14, 2024 · aa72329 · aa72329
2 parents 00900f9 + fda8b60
commit aa72329
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -179,7 +179,7 @@ jobs:
           echo "alias_tags=${alias_tags[*]}" >> $GITHUB_OUTPUT
 
       - name: Pull main and akmods images
-        uses: Wandalen/wretry.action@v3.4.0
+        uses: Wandalen/wretry.action@v3.5.0
         with:
           attempt_limit: 3
           attempt_delay: 15000
@@ -192,7 +192,7 @@ jobs:
 
       - name: Get source versions
         id: labels
-        uses: Wandalen/wretry.action@v3.4.0
+        uses: Wandalen/wretry.action@v3.5.0
         with:
           attempt_limit: 3
           attempt_delay: 15000
@@ -271,7 +271,7 @@ jobs:
 
       # Push the image to GHCR (Image Registry)
       - name: Push To GHCR
-        uses: Wandalen/wretry.action@v3.4.0
+        uses: Wandalen/wretry.action@v3.5.0
         id: push
         if: github.event_name != 'pull_request'
         env:

diff --git a/system_files/desktop/shared/usr/etc/default/waydroid-launcher b/system_files/desktop/shared/usr/etc/default/waydroid-launcher
@@ -13,7 +13,7 @@ case "$(cat /sys/devices/virtual/dmi/id/product_name)" in
 	"ROG Ally RC71L_RC71L" | "G1618-04" | "G1617-01" | "Loki Max")
 		WAYDROID_WIDTH=1920
 		WAYDROID_HEIGHT=1080 ;;
-	"AYANEO 2" | "AYANEO 2S" | "AOKZOE A1 AR07" | "G1619-04" | "AIR Plus")
+	"AYANEO 2" | "AYANEO 2S" | "AOKZOE A1 AR07" | "AOKZOE A1 Pro" | "G1619-04" | "AIR Plus")
 		WAYDROID_WIDTH=1920
 		WAYDROID_HEIGHT=1200 ;;
 	"83E1")

diff --git a/system_files/desktop/shared/usr/libexec/hwsupport/hhd-supported-hardware b/system_files/desktop/shared/usr/libexec/hwsupport/hhd-supported-hardware
@@ -1,7 +1,7 @@
 #!/usr/bin/bash
 # Returns true for hardware that is supported by HHD
 SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
-if [[ ":ROG Ally RC71L_RC71L:ROG Ally RC71L:83E1:G1618-04:G1617-01:G1619-05:AIR Plus:AIR:AYANEO GEEK:AYANEO 2:AYANEO 2S:AOKZOE A1 AR07:G1619-04:Win600:Loki Max:Loki Zero:Loki MiniPro:" =~ ":$SYS_ID:" ]]; then
+if [[ ":ROG Ally RC71L_RC71L:ROG Ally RC71L:83E1:G1618-04:G1617-01:G1619-05:AIR Plus:AIR:AYANEO GEEK:AYANEO 2:AYANEO 2S:AOKZOE A1 AR07:AOKZOE A1 Pro:G1619-04:Win600:Loki Max:Loki Zero:Loki MiniPro:" =~ ":$SYS_ID:" ]]; then
 	exit 0
 fi
 

diff --git a/system_files/desktop/shared/usr/libexec/hwsupport/simpledeckytdp-supported-hardware b/system_files/desktop/shared/usr/libexec/hwsupport/simpledeckytdp-supported-hardware
@@ -1,7 +1,7 @@
 #!/usr/bin/bash
 # Returns true for hardware that is supported by SimpleDeckyTDP
 SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
-if [[ ":ROG Ally RC71L_RC71L:ROG Ally RC71L:83E1:G1618-04:G1619-04:G1617-01:G1619-05:AIR Plus:AIR:SLIDE:V3:" =~ ":$SYS_ID:" ]]; then
+if [[ ":ROG Ally RC71L_RC71L:ROG Ally RC71L:83E1:G1618-04:G1619-04:G1617-01:G1619-05:AIR Plus:AIR:SLIDE:V3:AOKZOE A1 AR07:AOKZOE A1 Pro:" =~ ":$SYS_ID:" ]]; then
 	exit 0
 fi