Skip to content

Commit

Permalink
Merge remote-tracking branch 'maplibre/main' into basepath
Browse files Browse the repository at this point in the history
  • Loading branch information
sharkAndshark committed Feb 25, 2024
2 parents 0b7cb20 + fba9af8 commit a24285a
Show file tree
Hide file tree
Showing 13 changed files with 117 additions and 125 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -394,22 +394,22 @@ jobs:
# Replace the default Nginx configuration file
echo "$nginxConf"
Set-Content -Path "C:\tools\nginx-1.25.3\conf\nginx.conf" -Value $nginxConf
Get-Content -Path "C:\tools\nginx-1.25.3\conf\nginx.conf"
Set-Content -Path "C:\tools\nginx-1.25.4\conf\nginx.conf" -Value $nginxConf
Get-Content -Path "C:\tools\nginx-1.25.4\conf\nginx.conf"
# Start Nginx
#Get-Service -ErrorAction SilentlyContinue
#Get-CimInstance -ClassName Win32_Service
Set-Service nginx -StartupType manual
Start-Service nginx
#Start-Process -FilePath "C:\tools\nginx-1.25.3\nginx.exe"
dir C:\tools\nginx-1.25.3\logs\
#Start-Process -FilePath "C:\tools\nginx-1.25.4\nginx.exe"
dir C:\tools\nginx-1.25.4\logs\
Start-Sleep -Seconds 5
netstat -a
# Print Nginx Error Logs (on Windows systems)
#nginx -t
Get-Content -Path "C:\tools\nginx-1.25.3\logs\error.log"
Get-Content -Path "C:\tools\nginx-1.25.4\logs\error.log"
dir D:\a\martin\martin\
- name: Start postgres
uses: nyurik/action-setup-postgis@v1.1
Expand Down
Loading

0 comments on commit a24285a

Please sign in to comment.