Fix oci setup

shivammathur · Nov 24, 2021 · 0a41a03 · 0a41a03
1 parent dbdb32b
commit 0a41a03
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git 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_12_1
+          Get-ChildItem $oci_dir | ?{ $_.PSIsContainer } | Rename-Item -NewName instantclient_19_9
       - name: Patch Tools
         run: |
           $git_location="C:\Program Files\Git\cmd\git.exe"
@@ -79,6 +79,8 @@ jobs:
           ((Get-Content -path $snap_script_location -Raw) -replace "0, 7", "0, 10") | Set-Content -Path $snap_script_location
           ((Get-Content -path $branch_script_location -Raw) -replace "0, 7", "0, 10") | Set-Content -Path $branch_script_location
           ((Get-Content -path $config_location -Raw) -replace "pgo=1", "pgo=0") | Set-Content -Path $config_location
+          ((Get-Content -path $config_location -Raw) -replace "instantclient_12_1", "instantclient_19_9") | Set-Content -Path $config_location
+          ((Get-Content -path $config_location -Raw) -replace "oci8-12c", "oci8-19") | Set-Content -Path $config_location
       - name: build PHP
         run: |
           C:\php-snap-build\php-sdk\bin\vswhere

diff --git 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_12_1
+          Get-ChildItem $oci_dir | ?{ $_.PSIsContainer } | Rename-Item -NewName instantclient_19_9
       - name: Patch Tools
         run: |
           $git_location="C:\Program Files\Git\cmd\git.exe"
@@ -79,6 +79,8 @@ jobs:
           ((Get-Content -path $snap_script_location -Raw) -replace "0, 7", "0, 10") | Set-Content -Path $snap_script_location
           ((Get-Content -path $branch_script_location -Raw) -replace "0, 7", "0, 10") | Set-Content -Path $branch_script_location
           ((Get-Content -path $config_location -Raw) -replace "pgo=1", "pgo=0") | Set-Content -Path $config_location
+          ((Get-Content -path $config_location -Raw) -replace "instantclient_12_1", "instantclient_19_9") | Set-Content -Path $config_location
+          ((Get-Content -path $config_location -Raw) -replace "oci8-12c", "oci8-19") | Set-Content -Path $config_location
       - name: build PHP
         run: |
           C:\php-snap-build\php-sdk\bin\vswhere

diff --git 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_12_1
+          Get-ChildItem $oci_dir | ?{ $_.PSIsContainer } | Rename-Item -NewName instantclient_19_9
       - name: Patch Tools
         run: |
           $git_location="C:\Program Files\Git\cmd\git.exe"
@@ -79,6 +79,8 @@ jobs:
           ((Get-Content -path $snap_script_location -Raw) -replace "0, 7", "0, 10") | Set-Content -Path $snap_script_location
           ((Get-Content -path $branch_script_location -Raw) -replace "0, 7", "0, 10") | Set-Content -Path $branch_script_location
           ((Get-Content -path $config_location -Raw) -replace "pgo=1", "pgo=0") | Set-Content -Path $config_location
+          ((Get-Content -path $config_location -Raw) -replace "instantclient_12_1", "instantclient_19_9") | Set-Content -Path $config_location
+          ((Get-Content -path $config_location -Raw) -replace "oci8-12c", "oci8-19") | Set-Content -Path $config_location
       - name: build PHP
         run: |
           C:\php-snap-build\php-sdk\bin\vswhere

diff --git a/scripts/Get-Php.ps1 b/scripts/Get-Php.ps1
@@ -43,7 +43,7 @@ $semver = Invoke-RestMethod https://raw.githubusercontent.com/php/php-src/$branc
 Invoke-WebRequest -UseBasicParsing -Uri "https://github.com/shivammathur/php-builder-windows/releases/download/php$Version/php-$semver$ts-Win32-vs16-$Architecture.zip" -OutFile $Path\master.zip
 Expand-Archive -Path $Path\master.zip -DestinationPath $Path -Force
 Copy-Item $Path\php.ini-production -Destination $Path\php.ini
-Move-Item -Path $Path\ext\php_oci8_12c.dll -Destination $Path\ext\php_oci8.dll -Force
+Move-Item -Path $Path\ext\php_oci8*.dll -Destination $Path\ext\php_oci8.dll -Force
 $ts = 'nts'
 if($ThreadSafe) {
   $ts = 'ts'

diff --git a/scripts/Get-PhpNightly.ps1 b/scripts/Get-PhpNightly.ps1
@@ -40,7 +40,7 @@ if($Version -match '8.[0-1]') {
   Expand-Archive -Path $Path\master.zip -DestinationPath $Path -Force
   Copy-Item $Path\php.ini-production -Destination $Path\php.ini
 }
-Move-Item -Path $Path\ext\php_oci8_12c.dll -Destination $Path\ext\php_oci8.dll -Force
+Move-Item -Path $Path\ext\php_oci8*.dll -Destination $Path\ext\php_oci8.dll -Force
 $ts = 'nts'
 if($ThreadSafe) {
   $ts = 'ts'