Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: make nix compilation environment config more robust #5183

Merged
merged 5 commits into from
Dec 18, 2024
Merged

chore: make nix compilation environment config more robust #5183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2a0a8fa
chore: improve nix-shell support
sunng87 Dec 17, 2024
ad8a6cb
fix: add pkg-config
sunng87 Dec 17, 2024
12af5f2
ci: add a github action to ensure build on clean system
sunng87 Dec 17, 2024
981fe6c
ci: optimise dependencies of task
sunng87 Dec 17, 2024
75e5ac0
ci: move clean build to nightly
sunng87 Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .github/workflows/nightly-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,17 @@ jobs:
GT_S3_REGION: ${{ vars.AWS_CI_TEST_BUCKET_REGION }}
UNITTEST_LOG_DIR: "__unittest_logs"

cleanbuild-linux-nix:
runs-on: ubuntu-latest-8-cores
timeout-minutes: 60
needs: [coverage, fmt, clippy, check]
steps:
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v27
with:
nix_path: nixpkgs=channel:nixos-unstable
- run: nix-shell --pure --run "cargo build"

check-status:
name: Check status
needs: [sqlness-test, sqlness-windows, test-on-windows]
Expand Down
1 change: 1 addition & 0 deletions rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
[toolchain]
channel = "nightly-2024-10-19"
components = ["rust-analyzer"]
15 changes: 10 additions & 5 deletions shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,24 @@ let
pkgs = import nixpkgs { config = {}; overlays = []; };
in

pkgs.mkShellNoCC {
packages = with pkgs; [
pkgs.mkShell rec {
nativeBuildInputs = with pkgs; [
pkg-config
git
clang
gcc
mold
libgit2
protobuf
mold
(fenix.fromToolchainFile {
dir = ./.;
})
fenix.rust-analyzer
cargo-nextest
taplo
];

buildInputs = with pkgs; [
libgit2
];

LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildInputs;
}
Loading