Skip to content

Commit

Permalink
done
Browse files Browse the repository at this point in the history
  • Loading branch information
nyurik committed Sep 30, 2023
1 parent a50bbd4 commit 8501cad
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ jobs:
- name: Rust Versions
run: rustc --version && cargo --version
- uses: Swatinem/rust-cache@v2
if: github.event_name != 'release' && github.event_name != 'workflow_dispatch'
- name: Lint (Linux)
if: matrix.target == 'x86_64-unknown-linux-gnu'
run: |
Expand All @@ -75,7 +76,7 @@ jobs:
set -x
export RUSTFLAGS='-C strip=debuginfo'
cargo build --release --target ${{ matrix.target }} --package martin-mbtiles
cargo build --release --target ${{ matrix.target }} --package martin --features=$FEATURES
cargo build --release --target ${{ matrix.target }} --package martin
mkdir -p target_releases
mv target/${{ matrix.target }}/release/mbtiles${{ matrix.ext }} target_releases/
Expand All @@ -96,6 +97,7 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v4
- uses: Swatinem/rust-cache@v2
if: github.event_name != 'release' && github.event_name != 'workflow_dispatch'
- name: Install cross
run: |
cargo install cross
Expand Down Expand Up @@ -141,6 +143,7 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v4
- uses: Swatinem/rust-cache@v2
if: github.event_name != 'release' && github.event_name != 'workflow_dispatch'
- name: Start postgres
uses: nyurik/action-setup-postgis@v1
id: pg
Expand Down Expand Up @@ -266,6 +269,7 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v4
- uses: Swatinem/rust-cache@v2
if: github.event_name != 'release' && github.event_name != 'workflow_dispatch'
- name: Setup database
run: tests/fixtures/initdb.sh
env:
Expand Down Expand Up @@ -357,6 +361,7 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v4
- uses: Swatinem/rust-cache@v2
if: github.event_name != 'release' && github.event_name != 'workflow_dispatch'
- name: Setup database
run: tests/fixtures/initdb.sh
env:
Expand Down
1 change: 1 addition & 0 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ fmt2:
# Run cargo clippy
clippy:
cargo clippy --workspace --all-targets --bins --tests --lib --benches -- -D warnings
RUSTDOCFLAGS="-D warnings" cargo doc --no-deps --workspace

# These steps automatically run before git push via a git hook
[private]
Expand Down
6 changes: 3 additions & 3 deletions martin/src/pg/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ pub trait PgInfo {
#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
pub struct PgSslCerts {
/// Same as PGSSLCERT
/// https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNECT-SSLCERT
/// ([docs](https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNECT-SSLCERT))
#[serde(skip_serializing_if = "Option::is_none")]
pub ssl_cert: Option<std::path::PathBuf>,
/// Same as PGSSLKEY
/// https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNECT-SSLKEY
/// ([docs](https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNECT-SSLKEY))
#[serde(skip_serializing_if = "Option::is_none")]
pub ssl_key: Option<std::path::PathBuf>,
/// Same as PGSSLROOTCERT
/// https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNECT-SSLROOTCERT
/// ([docs](https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNECT-SSLROOTCERT))
#[serde(skip_serializing_if = "Option::is_none")]
pub ssl_root_cert: Option<std::path::PathBuf>,
}
Expand Down

0 comments on commit 8501cad

Please sign in to comment.