diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bed29e5..849768e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: name: Rustfmt runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions-rs/toolchain@v1 with: toolchain: stable @@ -23,7 +23,7 @@ jobs: name: Clippy lint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions-rs/toolchain@v1 with: toolchain: stable @@ -46,7 +46,7 @@ jobs: os: ubuntu-latest rust: nightly steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions-rs/toolchain@v1 with: toolchain: ${{ matrix.rust }} @@ -54,13 +54,26 @@ jobs: - name: Build and run tests run: cargo test --all-features + cleanbuild-linux-nix: + name: Run clean build on Linux + runs-on: ubuntu-latest + needs: [test] + timeout-minutes: 15 + steps: + - uses: actions/checkout@v6 + with: + fetch-depth: 0 + persist-credentials: false + - uses: cachix/install-nix-action@v31 + - run: nix develop --command cargo test + integration: name: Integration tests runs-on: ubuntu-latest timeout-minutes: 15 needs: [test] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions-rs/toolchain@v1 with: toolchain: stable diff --git a/flake.lock b/flake.lock index 9451547..9b496f2 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1762324835, - "narHash": "sha256-OJdnrIFHKBy97Fn88//ag1QK6iuBVafrU3uAvccGNUo=", + "lastModified": 1764571808, + "narHash": "sha256-+oo9W5rz03TjfpNqDSLEQwgKiuBbjrHdORyTHli2RuM=", "owner": "nix-community", "repo": "fenix", - "rev": "9bfa4155d454bbe19e076a23355cff95f0a407c0", + "rev": "df3c2e78ec13418f85c1f26e77a50f865ec57d38", "type": "github" }, "original": { @@ -41,11 +41,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762286042, - "narHash": "sha256-OD5HsZ+sN7VvNucbrjiCz7CHF5zf9gP51YVJvPwYIH8=", + "lastModified": 1764527385, + "narHash": "sha256-nA5ywiGKl76atrbdZ5Aucd8SjF/v8ew9b9QsC+MKL14=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "12c1f0253aa9a54fdf8ec8aecaafada64a111e24", + "rev": "23258e03aaa49b3a68597e3e50eb0cbce7e42e9d", "type": "github" }, "original": { @@ -65,11 +65,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1762274641, - "narHash": "sha256-upzIY3p+q/NRziTmyQ0fUaKkUJrT81JruB0IxgzdQ7o=", + "lastModified": 1764525349, + "narHash": "sha256-vR3vU9AwzMsBvjNeeG2inA5W/2MwseFk5NIIrLFEMHk=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "5ffe3f45ce89355dc4289e620273ea8b53ca2078", + "rev": "d646b23f000d099d845f999c2c1e05b15d9cdc78", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6b7a93c..e3881f1 100644 --- a/flake.nix +++ b/flake.nix @@ -21,9 +21,8 @@ ]); buildInputs = with pkgs; [ llvmPackages.libclang - libpq - duckdb.dev - duckdb.lib + libpq.dev + libpq.out ]; in { @@ -48,12 +47,11 @@ postgresql_18.out ]; - LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildInputs; + buildInputs = buildInputs; + shellHook = '' export CC=clang export CXX=clang++ - export DUCKDB_LIB_DIR="${pkgs.duckdb.lib}/lib" - export DUCKDB_INCLUDE_DIR="${pkgs.duckdb.dev}/include" ''; }; });