Skip to content

Commit d4a6845

Browse files
authored
ci: flake update and adding ci (#253)
1 parent 7517fa0 commit d4a6845

File tree

3 files changed

+30
-19
lines changed

3 files changed

+30
-19
lines changed

.github/workflows/ci.yml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: Rustfmt
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v6
1515
- uses: actions-rs/toolchain@v1
1616
with:
1717
toolchain: stable
@@ -23,7 +23,7 @@ jobs:
2323
name: Clippy lint
2424
runs-on: ubuntu-latest
2525
steps:
26-
- uses: actions/checkout@v4
26+
- uses: actions/checkout@v6
2727
- uses: actions-rs/toolchain@v1
2828
with:
2929
toolchain: stable
@@ -46,21 +46,34 @@ jobs:
4646
os: ubuntu-latest
4747
rust: nightly
4848
steps:
49-
- uses: actions/checkout@v4
49+
- uses: actions/checkout@v6
5050
- uses: actions-rs/toolchain@v1
5151
with:
5252
toolchain: ${{ matrix.rust }}
5353
override: true
5454
- name: Build and run tests
5555
run: cargo test --all-features
5656

57+
cleanbuild-linux-nix:
58+
name: Run clean build on Linux
59+
runs-on: ubuntu-latest
60+
needs: [test]
61+
timeout-minutes: 15
62+
steps:
63+
- uses: actions/checkout@v6
64+
with:
65+
fetch-depth: 0
66+
persist-credentials: false
67+
- uses: cachix/install-nix-action@v31
68+
- run: nix develop --command cargo test
69+
5770
integration:
5871
name: Integration tests
5972
runs-on: ubuntu-latest
6073
timeout-minutes: 15
6174
needs: [test]
6275
steps:
63-
- uses: actions/checkout@v4
76+
- uses: actions/checkout@v6
6477
- uses: actions-rs/toolchain@v1
6578
with:
6679
toolchain: stable

flake.lock

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@
2121
]);
2222
buildInputs = with pkgs; [
2323
llvmPackages.libclang
24-
libpq
25-
duckdb.dev
26-
duckdb.lib
24+
libpq.dev
25+
libpq.out
2726
];
2827
in
2928
{
@@ -48,12 +47,11 @@
4847
postgresql_18.out
4948
];
5049

51-
LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildInputs;
50+
buildInputs = buildInputs;
51+
5252
shellHook = ''
5353
export CC=clang
5454
export CXX=clang++
55-
export DUCKDB_LIB_DIR="${pkgs.duckdb.lib}/lib"
56-
export DUCKDB_INCLUDE_DIR="${pkgs.duckdb.dev}/include"
5755
'';
5856
};
5957
});

0 commit comments

Comments
 (0)