Merge pull request #236 from nanasess/improve/php8.3

Fix install target version
nanasess · Dec 17, 2023 · 60f5c2a · 60f5c2a
2 parents 9ae2be2 + f8a2ed4
commit 60f5c2a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -23,6 +23,10 @@ jobs:
         os: [ubuntu-22.04, ubuntu-20.04, windows-2022, windows-2019]
         php: ['5.4', '5.5', '5.6', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '7.2.11', '7.2.12', '8.1.9', '8.2', '8.3']
         exclude:
+          - os: windows-2019
+            php: 5.4
+          - os: windows-2022
+            php: 5.4
           - os: windows-2019
             php: 7.2.11
           - os: windows-2019

diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ This action sets up a PHP environment for use in actions by:
 
 ## PHP version support
 
-- 5.4
+- 5.4(Ubuntu only)
 - 5.5
 - 5.6
 - 7.0

diff --git a/lib/apt-install-php-ubuntu.sh b/lib/apt-install-php-ubuntu.sh
@@ -14,7 +14,7 @@ fi
 sudo apt-get update
 
 if [[ $version = '5.6' ]] \
-       || [[ $version = '8.2' ]] \
+       || [[ `echo "$version >= 8.2" | bc` == 1 ]] \
        || [[ $release = 'jammy' && `echo "$version < 8.1" | bc` == 1 ]] \
        || [[ $release = 'focal' && `echo "$version < 7.4 || $version >= 8.0" | bc` == 1 ]] \
        || [[ $release = 'bionic' && `echo "$version < 7.4 || $version >= 8.0" | bc` == 1 ]]
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ This action sets up a PHP environment for use in actions by: @@
     ## PHP version support
-    - 5.4
+    - 5.4(Ubuntu only)
     - 5.5
     - 5.6
     - 7.0
@@ Expand Down @@