From c510e2c048d56256ea0b11974d58de87df919b2b Mon Sep 17 00:00:00 2001 From: wangfenjin Date: Sat, 11 Sep 2021 21:37:39 +0800 Subject: [PATCH 1/4] test fix-151 Change-Id: I761eb6b958485e9c026b902abe802c8ad260f91d --- .github/workflows/rust.yaml | 78 +------------------------------------ 1 file changed, 1 insertion(+), 77 deletions(-) diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml index a1f55eed..9328c4dd 100644 --- a/.github/workflows/rust.yaml +++ b/.github/workflows/rust.yaml @@ -35,86 +35,10 @@ jobs: targets: ${{ matrix.target }} components: 'rustfmt, clippy' - - run: cargo fmt --all -- --check - # - name: Download DuckDB - # run: | - # wget https://github.com/duckdb/duckdb/releases/download/v0.2.8/libduckdb-linux-amd64.zip -O libduckdb.zip - # unzip libduckdb.zip -d libduckdb - # - run: cargo clippy --all-targets --workspace --features buildtime_bindgen --features modern-full -- -D warnings -A clippy::redundant-closure - - run: cargo clippy --all-targets --workspace --features bundled --features modern-full -- -D warnings -A clippy::redundant-closure - name: run cargo clippy - # env: - # DUCKDB_LIB_DIR: ${{ github.workspace }}/libduckdb - # DUCKDB_INCLUDE_DIR: ${{ github.workspace }}/libduckdb - # LD_LIBRARY_PATH: ${{ github.workspace }}/libduckdb - - name: Run cargo-tarpaulin - uses: actions-rs/tarpaulin@v0.1 - with: - # Intentionally omit time feature until we're on time 0.3, at which - # point it should be added to `bundled-full`. - # args: '--features "buildtime_bindgen" --features "modern-full" --avoid-cfg-tarpaulin' # TODO restore to normal (https://github.com/xd009642/tarpaulin/issues/756#issuecomment-838769320) - args: '--features "bundled" --features "modern-full" --avoid-cfg-tarpaulin' # TODO restore to normal (https://github.com/xd009642/tarpaulin/issues/756#issuecomment-838769320) - # env: - # DUCKDB_LIB_DIR: ${{ github.workspace }}/libduckdb - # DUCKDB_INCLUDE_DIR: ${{ github.workspace }}/libduckdb - # LD_LIBRARY_PATH: ${{ github.workspace }}/libduckdb - - name: Upload to codecov.io - uses: codecov/codecov-action@v1 - - sanitizer: - name: Address Sanitizer - needs: test - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - # Need nightly rust. - - uses: hecrj/setup-rust-action@v1 - with: - rust-version: nightly - components: rust-src - - name: Tests with asan - env: - RUSTFLAGS: -Zsanitizer=address - RUSTDOCFLAGS: -Zsanitizer=address - ASAN_OPTIONS: "detect_stack_use_after_return=1:detect_leaks=1" - # Work around https://github.com/rust-lang/rust/issues/59125 by - # disabling backtraces. In an ideal world we'd probably suppress the - # leak sanitization, but we don't care about backtraces here, so long - # as the other tests have them. - RUST_BACKTRACE: "0" - run: cargo -Z build-std test --features 'bundled' --features 'modern-full' --target x86_64-unknown-linux-gnu - - # cargo publish - - uses: wangfenjin/publish-crates@main - name: cargo publish --dry-run - if: startsWith(github.ref, 'refs/tags/') != true - with: - path: './' - args: --allow-dirty --all-features - dry-run: true - ignore-published: true - - uses: wangfenjin/publish-crates@main + - uses: katyo/publish-crates@fix-151 name: cargo publish - if: startsWith(github.ref, 'refs/tags/') with: path: './' args: --no-verify --allow-dirty --all-features registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }} ignore-published: true - - # create release - - name: "Build Changelog" - id: build_changelog - if: startsWith(github.ref, 'refs/tags/') - uses: mikepenz/release-changelog-builder-action@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Create Release - if: startsWith(github.ref, 'refs/tags/') - uses: actions/create-release@v1 - with: - tag_name: ${{ github.ref }} - release_name: ${{ github.ref }} - body: ${{steps.build_changelog.outputs.changelog}} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 21512911b9db30648be575ea2535a4686861d46a Mon Sep 17 00:00:00 2001 From: wangfenjin Date: Sun, 19 Sep 2021 15:06:44 +0800 Subject: [PATCH 2/4] test octokit-less Change-Id: I4151b282edc48c72aec28397c0194ef4150dd57d --- .github/workflows/rust.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml index 9328c4dd..efc4afa7 100644 --- a/.github/workflows/rust.yaml +++ b/.github/workflows/rust.yaml @@ -35,7 +35,7 @@ jobs: targets: ${{ matrix.target }} components: 'rustfmt, clippy' - - uses: katyo/publish-crates@fix-151 + - uses: katyo/publish-crates@octokit-less name: cargo publish with: path: './' From 55f5e5e7552960ed011c49dc25158a2e7d092ac4 Mon Sep 17 00:00:00 2001 From: wangfenjin Date: Sun, 19 Sep 2021 15:12:11 +0800 Subject: [PATCH 3/4] dry-run Change-Id: Id35b49645221a7418a282cf7281beb7268f75166 --- .github/workflows/rust.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml index efc4afa7..961171ce 100644 --- a/.github/workflows/rust.yaml +++ b/.github/workflows/rust.yaml @@ -35,10 +35,17 @@ jobs: targets: ${{ matrix.target }} components: 'rustfmt, clippy' + - uses: katyo/publish-crates@octokit-less + name: cargo publish + with: + path: './' + args: --no-verify --allow-dirty --all-features + dry-run: true + registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }} + - uses: katyo/publish-crates@octokit-less name: cargo publish with: path: './' args: --no-verify --allow-dirty --all-features registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }} - ignore-published: true From 1065249d71d81083c572f44b3f1ce93fd5a5d02e Mon Sep 17 00:00:00 2001 From: wangfenjin Date: Sun, 19 Sep 2021 15:14:23 +0800 Subject: [PATCH 4/4] dry-run Change-Id: Ide2099e3eaf684ad7bcbf8bd05c4d0db1d8df3bf --- .github/workflows/rust.yaml | 10 +--------- Cargo.toml | 4 ++-- libduckdb-sys/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml index 961171ce..814bd22b 100644 --- a/.github/workflows/rust.yaml +++ b/.github/workflows/rust.yaml @@ -39,13 +39,5 @@ jobs: name: cargo publish with: path: './' - args: --no-verify --allow-dirty --all-features + args: --allow-dirty --all-features dry-run: true - registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }} - - - uses: katyo/publish-crates@octokit-less - name: cargo publish - with: - path: './' - args: --no-verify --allow-dirty --all-features - registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }} diff --git a/Cargo.toml b/Cargo.toml index e23ba7d0..56e5f84b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "duckdb" -version = "0.2.9" +version = "0.2.10" authors = ["wangfenjin "] edition = "2018" description = "Ergonomic wrapper for DuckDB" @@ -65,7 +65,7 @@ rand = "0.8.3" [dependencies.libduckdb-sys] path = "libduckdb-sys" -version = "0.2.9" +version = "0.2.10" [package.metadata.docs.rs] features = [] diff --git a/libduckdb-sys/Cargo.toml b/libduckdb-sys/Cargo.toml index 3c0ca279..9439b8b5 100644 --- a/libduckdb-sys/Cargo.toml +++ b/libduckdb-sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libduckdb-sys" -version = "0.2.9" +version = "0.2.10" authors = ["wangfenjin "] edition = "2018" build = "build.rs"