diff --git a/.ci/azure-pipelines/install-environment_macos.bash b/.ci/azure-pipelines/install-environment_macos.bash index 0efe22bd775..e758e0f9b5a 100755 --- a/.ci/azure-pipelines/install-environment_macos.bash +++ b/.ci/azure-pipelines/install-environment_macos.bash @@ -5,6 +5,8 @@ # that can be found in the LICENSE file at the root of the # Mumble source tree or at . +sudo dscl . list /Users | grep -v '^_' + echo "Configuring PostgreSQL..." if [[ -f "/usr/local/var/postgres/postmaster.pid" ]]; then @@ -12,13 +14,13 @@ if [[ -f "/usr/local/var/postgres/postmaster.pid" ]]; then rm "/usr/local/var/postgres/postmaster.pid" fi -brew services restart -vvv postgresql +brew services start -vvv postgresql cat /usr/local/var/log/postgresql@14.log echo "CREATE DATABASE mumble_test_db; "\ "CREATE USER mumble_test_user ENCRYPTED PASSWORD 'MumbleTestPassword'; "\ - "GRANT ALL PRIVILEGES ON DATABASE mumble_test_db TO mumble_test_user;" | psql postgres + "GRANT ALL PRIVILEGES ON DATABASE mumble_test_db TO mumble_test_user;" | psql -d postgres currentDir=$(pwd) diff --git a/.ci/install-environment_windows.ps1 b/.ci/install-environment_windows.ps1 index 29c3bfab31f..2131ebf0e58 100644 --- a/.ci/install-environment_windows.ps1 +++ b/.ci/install-environment_windows.ps1 @@ -137,7 +137,7 @@ Write-Host "Configuring PostgreSQL..." $env:PATH += ";$env:PGBIN" $env:PGPASSWORD="root" -pg_ctl restart -D "$env:PGDATA" +pg_ctl start -D "$env:PGDATA" Write-Output ("CREATE DATABASE mumble_test_db; " + "CREATE USER mumble_test_user ENCRYPTED PASSWORD 'MumbleTestPassword'; " + @@ -146,15 +146,14 @@ Write-Output ("CREATE DATABASE mumble_test_db; " + Write-Host "Configuring MySQL..." -#mysqld --verbose --help +Write-Output "[mysqld]`nlog-bin-trust-function-creators = 1" | Add-Content -Path C:/Windows/my.ini + mysqld --initialize-insecure --console Start-Process mysqld # Give the MySQL daemon some time to start up Start-Sleep -Seconds 5 -Write-Output "[mysqld]`nlog-bin-trust-function-creators = 1" | Add-Content -Path C:/Windows/my.ini - Write-Output ("CREATE DATABASE mumble_test_db; " + "CREATE USER 'mumble_test_user'@'localhost' IDENTIFIED BY 'MumbleTestPassword'; " + "GRANT ALL PRIVILEGES ON mumble_test_db.* TO 'mumble_test_user'@'localhost';") | mysql --user=root