-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
c5d8aa0
commit 1159ebd
Showing
10 changed files
with
78 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,7 +14,7 @@ jobs: | |
fail-fast: false | ||
matrix: | ||
os: [ubuntu-latest, macos-13, macos-14, windows-2019] | ||
features: [default, bundled, buildtime_bindgen] | ||
features: [default, bundled, bundled_without_openssl, buildtime_bindgen] | ||
runs-on: ${{ matrix.os }} | ||
steps: | ||
- name: Checkout sources | ||
|
@@ -44,23 +44,23 @@ jobs: | |
sudo service postgresql restart && sleep 3 | ||
- name: Install postgres (MacOS) | ||
if: matrix.os == 'macos-13' && matrix.features != 'bundled' | ||
if: matrix.os == 'macos-13' && matrix.features != 'bundled' && matrix.features != 'bundled_without_openssl' | ||
run: | | ||
brew install postgresql | ||
brew services start postgresql@14 | ||
sleep 3 | ||
createuser -s postgres | ||
- name: Install postgres (MacOS M1) | ||
if: matrix.os == 'macos-14' && matrix.features != 'bundled' | ||
if: matrix.os == 'macos-14' && matrix.features != 'bundled' && matrix.features != 'bundled_without_openssl' | ||
run: | | ||
brew install postgresql | ||
brew services start postgresql@14 | ||
sleep 3 | ||
createuser -s postgres | ||
- name: Install postgres (Windows) | ||
if: runner.os == 'Windows' && matrix.features != 'bundled' | ||
if: runner.os == 'Windows' && matrix.features != 'bundled' && matrix.features != 'bundled_without_openssl' | ||
shell: bash | ||
run: | | ||
choco install postgresql12 --force --params '/Password:root' | ||
|
@@ -74,6 +74,18 @@ jobs: | |
echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV | ||
vcpkg install openssl:x64-windows-static-md | ||
- name: Remove openssl (Linux, bundled_without_openssl) | ||
if: runner.os == 'Linux' && matrix.features == 'bundled_without_openssl' | ||
run: sudo apt-get remove -y libssl-dev | ||
|
||
- name: Remove openssl (MacOS, bundled_without_openssl) | ||
if: matrix.os == 'macos-13' && matrix.features == 'bundled_without_openssl' | ||
run: brew uninstall [email protected] | ||
|
||
- name: Remove openssl (MacOS M1, bundled_without_openssl) | ||
if: matrix.os == 'macos-14' && matrix.features == 'bundled_without_openssl' | ||
run: brew uninstall [email protected] | ||
|
||
- name: Install rust toolchain | ||
uses: dtolnay/rust-toolchain@stable | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
#[cfg(feature = "with-openssl")] | ||
extern crate openssl_sys; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,9 @@ | ||
extern crate pq_sys; | ||
|
||
#[cfg(not(feature = "bundled_without_openssl"))] | ||
#[test] | ||
fn test_ssl_init() | ||
{ | ||
unsafe{pq_sys::PQinitSSL(1);} | ||
} | ||
fn test_ssl_init() { | ||
unsafe { | ||
pq_sys::PQinitSSL(1); | ||
} | ||
} |