From d9a8d1802a1048d854cc2e3be21fddcb6f4f8896 Mon Sep 17 00:00:00 2001
From: Shivam Mathur <shivam_jpr@hotmail.com>
Date: Sat, 22 Jun 2024 00:20:01 +0000
Subject: [PATCH] Fix instantclient setup

---
 .github/workflows/php80.yml     | 2 +-
 .github/workflows/php81.yml     | 2 +-
 .github/workflows/php82.yml     | 2 +-
 .github/workflows/php83.yml     | 2 +-
 .github/workflows/phpmaster.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/php80.yml b/.github/workflows/php80.yml
index 1d10383..985f758 100644
--- a/.github/workflows/php80.yml
+++ b/.github/workflows/php80.yml
@@ -63,7 +63,7 @@ jobs:
           Invoke-WebRequest -UseBasicParsing -Uri https://download.oracle.com/otn_software/nt/instantclient/instantclient-sdk-$suffix.zip -OutFile $oci_dir\sdk.zip
           Expand-Archive -Path $oci_dir\instantclient.zip -DestinationPath $oci_dir -Force
           Expand-Archive -Path $oci_dir\sdk.zip -DestinationPath $oci_dir -Force
-          Get-ChildItem $oci_dir | ?{ $_.PSIsContainer } | Rename-Item -NewName instantclient_19_9
+          Get-ChildItem $oci_dir -Filter 'instantclient*' | ?{ $_.PSIsContainer } | Rename-Item -NewName instantclient_19_9
       - name: Patch Tools
         run: |
           $git_location="C:\Program Files\Git\cmd\git.exe"
diff --git a/.github/workflows/php81.yml b/.github/workflows/php81.yml
index 6232c00..bafe170 100644
--- a/.github/workflows/php81.yml
+++ b/.github/workflows/php81.yml
@@ -63,7 +63,7 @@ jobs:
           Invoke-WebRequest -UseBasicParsing -Uri https://download.oracle.com/otn_software/nt/instantclient/instantclient-sdk-$suffix.zip -OutFile $oci_dir\sdk.zip
           Expand-Archive -Path $oci_dir\instantclient.zip -DestinationPath $oci_dir -Force
           Expand-Archive -Path $oci_dir\sdk.zip -DestinationPath $oci_dir -Force
-          Get-ChildItem $oci_dir | ?{ $_.PSIsContainer } | Rename-Item -NewName instantclient_19_9
+          Get-ChildItem $oci_dir -Filter 'instantclient*' | ?{ $_.PSIsContainer } | Rename-Item -NewName instantclient_19_9
       - name: Patch Tools
         run: |
           $git_location="C:\Program Files\Git\cmd\git.exe"
diff --git a/.github/workflows/php82.yml b/.github/workflows/php82.yml
index d75ac1f..6063f20 100644
--- a/.github/workflows/php82.yml
+++ b/.github/workflows/php82.yml
@@ -63,7 +63,7 @@ jobs:
           Invoke-WebRequest -UseBasicParsing -Uri https://download.oracle.com/otn_software/nt/instantclient/instantclient-sdk-$suffix.zip -OutFile $oci_dir\sdk.zip
           Expand-Archive -Path $oci_dir\instantclient.zip -DestinationPath $oci_dir -Force
           Expand-Archive -Path $oci_dir\sdk.zip -DestinationPath $oci_dir -Force
-          Get-ChildItem $oci_dir | ?{ $_.PSIsContainer } | Rename-Item -NewName instantclient_19_9
+          Get-ChildItem $oci_dir -Filter 'instantclient*' | ?{ $_.PSIsContainer } | Rename-Item -NewName instantclient_19_9
       - name: Patch Tools
         run: |
           $git_location="C:\Program Files\Git\cmd\git.exe"
diff --git a/.github/workflows/php83.yml b/.github/workflows/php83.yml
index 9967e8e..915ca0b 100644
--- a/.github/workflows/php83.yml
+++ b/.github/workflows/php83.yml
@@ -63,7 +63,7 @@ jobs:
           Invoke-WebRequest -UseBasicParsing -Uri https://download.oracle.com/otn_software/nt/instantclient/instantclient-sdk-$suffix.zip -OutFile $oci_dir\sdk.zip
           Expand-Archive -Path $oci_dir\instantclient.zip -DestinationPath $oci_dir -Force
           Expand-Archive -Path $oci_dir\sdk.zip -DestinationPath $oci_dir -Force
-          Get-ChildItem $oci_dir | ?{ $_.PSIsContainer } | Rename-Item -NewName instantclient_19_9
+          Get-ChildItem $oci_dir -Filter 'instantclient*' | ?{ $_.PSIsContainer } | Rename-Item -NewName instantclient_19_9
       - name: Patch Tools
         run: |
           $git_location="C:\Program Files\Git\cmd\git.exe"
diff --git a/.github/workflows/phpmaster.yml b/.github/workflows/phpmaster.yml
index e647d94..fa58276 100644
--- a/.github/workflows/phpmaster.yml
+++ b/.github/workflows/phpmaster.yml
@@ -63,7 +63,7 @@ jobs:
           Invoke-WebRequest -UseBasicParsing -Uri https://download.oracle.com/otn_software/nt/instantclient/instantclient-sdk-$suffix.zip -OutFile $oci_dir\sdk.zip
           Expand-Archive -Path $oci_dir\instantclient.zip -DestinationPath $oci_dir -Force
           Expand-Archive -Path $oci_dir\sdk.zip -DestinationPath $oci_dir -Force
-          Get-ChildItem $oci_dir | ?{ $_.PSIsContainer } | Rename-Item -NewName instantclient_19_9
+          Get-ChildItem $oci_dir -Filter 'instantclient*' | ?{ $_.PSIsContainer } | Rename-Item -NewName instantclient_19_9
       - name: Patch Tools
         run: |
           $git_location="C:\Program Files\Git\cmd\git.exe"